diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index 643ac47054b..0fa82d230d8 100644
--- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -21,8 +21,24 @@ public sealed class MicrowaveBoundUserInterface : BoundUserInterface
         [ViewVariables]
         private readonly Dictionary<int, ReagentQuantity> _reagents = new();
 
+        // Frontier: UI parameters
+        private readonly string _menuTitle;
+        private readonly string _leftFlavorText;
+
         public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
+            // Frontier: switch UI params based on key
+            if ((MicrowaveUiKey)uiKey == MicrowaveUiKey.ElectricRangeKey)
+            {
+                _menuTitle = "microwave-menu-range-title";
+                _leftFlavorText = "microwave-menu-range-footer-flavor-left";
+            }
+            else
+            {
+                _menuTitle = "microwave-menu-title";
+                _leftFlavorText = "microwave-menu-footer-flavor-left";
+            }
+            // End Frontier
         }
 
         protected override void Open()
@@ -60,6 +76,11 @@ protected override void Open()
                                                          ("time", Loc.GetString("microwave-menu-instant-button")));
                 }
             };
+
+            // Frontier: UI customization
+            _menu.Title = Loc.GetString(_menuTitle);
+            _menu.LeftFooter.Text = Loc.GetString(_leftFlavorText);
+            // End Frontier
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
index cd81ea0a9bf..c99462d9e7a 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
@@ -98,7 +98,7 @@
         <BoxContainer Orientation="Vertical">
             <PanelContainer StyleClasses="LowDivider" />
             <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
-                <Label Text="{Loc 'microwave-menu-footer-flavor-left'}" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc 'microwave-menu-footer-flavor-left'}" StyleClasses="WindowFooterText" Name="LeftFooter" Access="Public"/> <!-- Frontier: add Name, Access -->
                 <Label Text="{Loc 'microwave-menu-footer-flavor-right'}" StyleClasses="WindowFooterText"
                        HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
                 <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered" VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml b/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml
index 009538b45c3..e58a1c41b5f 100644
--- a/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml
+++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml
@@ -15,9 +15,8 @@
                Margin="2 0 0 0"/> <!-- Frontier: Label<RichTextLabel -->
     </BoxContainer>
     <BoxContainer Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center"> <!-- Frontier: remove HorizontalExpand -->
-        <TextureRect HorizontalAlignment="Center"
-                     Name="ProcessingTexture"
-                     Access="Public"/>
+        <BoxContainer Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalExpand="True" Name="ProcessingTextures"> <!-- Frontier: support for multiple machines -->
+        </BoxContainer>
         <RichTextLabel Name="ProcessingLabel"
                HorizontalAlignment="Center"
                VerticalAlignment="Center"
diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml.cs b/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml.cs
index 6545ab81508..e56bcc0c5d7 100644
--- a/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml.cs
+++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml.cs
@@ -4,6 +4,7 @@
 using Content.Client.UserInterface.ControlExtensions;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Content.Shared.Kitchen; // Frontier
 using Content.Shared.Nutrition.Components;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
@@ -63,11 +64,13 @@ private void GenerateControl(FoodButcheringData entry)
         SetSource(ent);
         ProcessingLabel.Text = Loc.GetString("guidebook-food-processing-butchering");
 
-        ProcessingTexture.Texture = entry.Type switch
+        var processingTexture = new TextureRect(); // Frontier
+        processingTexture.Texture = entry.Type switch
         {
             ButcheringType.Knife => GetRsiTexture("/Textures/Objects/Weapons/Melee/kitchen_knife.rsi", "icon"),
             _ => GetRsiTexture("/Textures/Structures/meat_spike.rsi", "spike")
         };
+        ProcessingTextures.AddChild(processingTexture); // Frontier
     }
 
     private void GenerateControl(FoodSlicingData entry)
@@ -80,7 +83,9 @@ private void GenerateControl(FoodSlicingData entry)
 
         SetSource(ent);
         ProcessingLabel.Text = Loc.GetString("guidebook-food-processing-slicing");
-        ProcessingTexture.Texture = GetRsiTexture("/Textures/Objects/Misc/utensils.rsi", "plastic_knife");
+        var processingTexture = new TextureRect(); // Frontier
+        processingTexture.Texture = GetRsiTexture("/Textures/Objects/Misc/utensils.rsi", "plastic_knife");
+        ProcessingTextures.AddChild(processingTexture); // Frontier
     }
 
     private void GenerateControl(FoodRecipeData entry)
@@ -101,8 +106,49 @@ private void GenerateControl(FoodRecipeData entry)
         var combinedIngredients = string.Join("\n", combinedLiquids.Union(combinedSolids));
         SourceLabel.Text = Loc.GetString("guidebook-food-processing-recipe", ("ingredients", combinedIngredients)); // Frontier: SetMessage<Text
 
-        ProcessingTexture.Texture = GetRsiTexture("/Textures/Structures/Machines/microwave.rsi", "mw");
-        ProcessingLabel.Text = Loc.GetString("guidebook-food-processing-cooking", ("time", recipe.CookTime));
+        // Frontier: multiple machine types
+        var recipeType = (MicrowaveRecipeType)recipe.RecipeType;
+        TextureRect processingTexture;
+        List<string> processingTypes = new();
+        if (recipeType.HasFlag(MicrowaveRecipeType.Microwave))
+        {
+            processingTexture = new TextureRect();
+            if (recipe.SecretRecipe)
+                processingTexture.Texture = GetRsiTexture("/Textures/Structures/Machines/microwave_syndie.rsi", "mw");
+            else
+                processingTexture.Texture = GetRsiTexture("/Textures/Structures/Machines/microwave.rsi", "mw");
+            ProcessingTextures.AddChild(processingTexture);
+            processingTypes.Add(Loc.GetString("guidebook-food-processing-type-microwave"));
+        }
+        if (recipeType.HasFlag(MicrowaveRecipeType.Oven))
+        {
+            processingTexture = new TextureRect();
+            if (recipe.SecretRecipe)
+                processingTexture.Texture = GetRsiTexture("/Textures/_NF/Structures/Machines/oven_syndie.rsi", "composite_off");
+            else
+                processingTexture.Texture = GetRsiTexture("/Textures/_NF/Structures/Machines/oven.rsi", "composite_off");
+            ProcessingTextures.AddChild(processingTexture);
+            processingTypes.Add(Loc.GetString("guidebook-food-processing-type-oven"));
+        }
+        if (recipeType.HasFlag(MicrowaveRecipeType.Assembler))
+        {
+            processingTexture = new TextureRect();
+            processingTexture.Texture = GetRsiTexture("/Textures/_NF/Structures/Machines/assembler.rsi", "assembler");
+            ProcessingTextures.AddChild(processingTexture);
+            processingTypes.Add(Loc.GetString("guidebook-food-processing-type-assembler"));
+        }
+        if (recipeType.HasFlag(MicrowaveRecipeType.MedicalAssembler))
+        {
+            processingTexture = new TextureRect();
+            processingTexture.Texture = GetRsiTexture("/Textures/_NF/Structures/Machines/medical_assembler.rsi", "mediwave-base");
+            ProcessingTextures.AddChild(processingTexture);
+            processingTypes.Add(Loc.GetString("guidebook-food-processing-type-medical-assembler"));
+        }
+        if (processingTypes.Count <= 0)
+            processingTypes.Add(Loc.GetString("guidebook-food-processing-type-generic"));
+        var processingTypeString = string.Join('/', processingTypes);
+        // End Frontier
+        ProcessingLabel.Text = Loc.GetString("guidebook-food-processing-cooking", ("processingTypes", processingTypeString), ("time", recipe.CookTime));
     }
 
     private void GenerateControl(FoodReactionData entry)
@@ -118,7 +164,9 @@ private void GenerateControl(FoodReactionData entry)
             .Where(it => it.Length > 0);
 
         SourceLabel.Text = Loc.GetString("guidebook-food-processing-recipe", ("ingredients", string.Join("\n", combinedReagents))); // Frontier: SetMessage<Text
-        ProcessingTexture.TexturePath = "/Textures/Interface/Misc/beakerlarge.png";
+        var processingTexture = new TextureRect(); // Frontier
+        processingTexture.TexturePath = "/Textures/Interface/Misc/beakerlarge.png";
+        ProcessingTextures.AddChild(processingTexture); // Frontier
         ProcessingLabel.Text = Loc.GetString("guidebook-food-processing-reaction");
     }
 
diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUi.cs b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUi.cs
new file mode 100644
index 00000000000..6300df87450
--- /dev/null
+++ b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUi.cs
@@ -0,0 +1,29 @@
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+
+namespace Content.Client._NF.CartridgeLoader.Cartridges;
+
+public sealed partial class AppraisalUi : UIFragment
+{
+    private AppraisalUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
+    {
+        _fragment = new AppraisalUiFragment();
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+        if (state is not AppraisalUiState appraisalUiState)
+            return;
+
+        _fragment?.UpdateState(appraisalUiState.AppraisedItems);
+    }
+}
diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml
new file mode 100644
index 00000000000..50d478cdb34
--- /dev/null
+++ b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml
@@ -0,0 +1,17 @@
+<cartridges:AppraisalUiFragment xmlns:cartridges="clr-namespace:Content.Client._NF.CartridgeLoader.Cartridges"
+                                 xmlns="https://spacestation14.io" Margin="1 0 2 0">
+    <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
+    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+        <BoxContainer Orientation="Vertical" MinHeight="32" MaxHeight="32" VerticalAlignment="Top" Margin="3 0">
+            <PanelContainer Name="HeaderPanel">
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="4">
+                    <Label HorizontalExpand="True" Text="{Loc 'appraisal-label-name'}"/>
+                    <Label HorizontalExpand="True" Text="{Loc 'appraisal-label-price'}"/>
+                </BoxContainer>
+            </PanelContainer>
+        </BoxContainer>
+        <ScrollContainer Name="ScrollContainer" HorizontalExpand="True" VerticalExpand="True">
+            <BoxContainer Orientation="Vertical" Name="AppraisedItemContainer" HorizontalExpand="True" VerticalExpand="True" VerticalAlignment="Top" Margin="3 0"/>
+        </ScrollContainer>
+    </BoxContainer>
+</cartridges:AppraisalUiFragment>
diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml.cs b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml.cs
new file mode 100644
index 00000000000..fbffdce9450
--- /dev/null
+++ b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml.cs
@@ -0,0 +1,65 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._NF.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class AppraisalUiFragment : BoxContainer
+{
+    private readonly StyleBoxFlat _styleBox = new()
+    {
+        BackgroundColor = Color.Transparent,
+        BorderColor = Color.FromHex("#5a5a5a"),
+        BorderThickness = new Thickness(0, 0, 0, 1)
+    };
+
+    public AppraisalUiFragment()
+    {
+        RobustXamlLoader.Load(this);
+        Orientation = LayoutOrientation.Vertical;
+        HorizontalExpand = true;
+        VerticalExpand = true;
+        HeaderPanel.PanelOverride = _styleBox;
+    }
+
+    public void UpdateState(List<AppraisedItem> items)
+    {
+        AppraisedItemContainer.RemoveAllChildren();
+
+        //Reverse the list so the oldest entries appear at the bottom
+        items.Reverse();
+
+        //Enable scrolling if there are more entries that can fit on the screen
+        ScrollContainer.HScrollEnabled = items.Count > 9;
+
+        foreach (var item in items)
+        {
+            AddAppraisedItem(item);
+        }
+    }
+
+    private void AddAppraisedItem(AppraisedItem item)
+    {
+        var row = new BoxContainer();
+        row.HorizontalExpand = true;
+        row.Orientation = LayoutOrientation.Horizontal;
+        row.Margin = new Thickness(4);
+
+        var nameLabel = new Label();
+        nameLabel.Text = item.Name;
+        nameLabel.HorizontalExpand = true;
+        nameLabel.ClipText = true;
+        row.AddChild(nameLabel);
+
+        var valueLabel = new Label();
+        valueLabel.Text = item.AppraisedPrice;
+        valueLabel.HorizontalExpand = true;
+        valueLabel.ClipText = true;
+        row.AddChild(valueLabel);
+
+        AppraisedItemContainer.AddChild(row);
+    }
+}
diff --git a/Content.Client/_NF/Kitchen/UI/AssemblerBoundUserInterface.cs b/Content.Client/_NF/Kitchen/UI/AssemblerBoundUserInterface.cs
new file mode 100644
index 00000000000..3c05b3aea70
--- /dev/null
+++ b/Content.Client/_NF/Kitchen/UI/AssemblerBoundUserInterface.cs
@@ -0,0 +1,125 @@
+using Content.Shared._NF.Kitchen.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Kitchen.Components;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+
+namespace Content.Client._NF.Kitchen.UI
+{
+    [UsedImplicitly]
+    public sealed class AssemblerBoundUserInterface : BoundUserInterface
+    {
+        [ViewVariables]
+        private AssemblerMenu? _menu;
+
+        [ViewVariables]
+        private readonly Dictionary<int, EntityUid> _solids = new();
+
+        [ViewVariables]
+        private readonly Dictionary<int, ReagentQuantity> _reagents = new();
+
+        private readonly string _menuTitle;
+        private readonly string _leftFlavorText;
+
+        public AssemblerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        {
+            if ((MicrowaveUiKey)uiKey == MicrowaveUiKey.MedicalAssemblerKey)
+            {
+                _menuTitle = "assembler-menu-medical-title";
+                _leftFlavorText = "assembler-menu-medical-footer-flavor-left";
+            }
+            else
+            {
+                _menuTitle = "assembler-menu-title";
+                _leftFlavorText = "assembler-menu-footer-flavor-left";
+            }
+        }
+
+        protected override void Open()
+        {
+            base.Open();
+            _menu = this.CreateWindow<AssemblerMenu>();
+            _menu.StartButton.OnPressed += _ => SendPredictedMessage(new AssemblerStartCookMessage());
+            _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage());
+            _menu.IngredientsList.OnItemSelected += args =>
+            {
+                SendPredictedMessage(new MicrowaveEjectSolidIndexedMessage(EntMan.GetNetEntity(_solids[args.ItemIndex])));
+            };
+
+            _menu.Title = Loc.GetString(_menuTitle);
+            _menu.LeftFooter.Text = Loc.GetString(_leftFlavorText);
+        }
+
+        protected override void UpdateState(BoundUserInterfaceState state)
+        {
+            base.UpdateState(state);
+            if (state is not MicrowaveUpdateUserInterfaceState cState || _menu == null)
+            {
+                return;
+            }
+
+            _menu.IsBusy = cState.IsMicrowaveBusy;
+            _menu.CurrentCooktimeEnd = cState.CurrentCookTimeEnd;
+
+            _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0);
+            // TODO move this to a component state and ensure the net ids.
+            RefreshContentsDisplay(EntMan.GetEntityArray(cState.ContainedSolids));
+
+            //Set the cook time info label
+            var cookTime = cState.CurrentCookTime.ToString();
+
+            _menu.CookTimeInfoLabel.Text = Loc.GetString("assembler-bound-user-interface-insert-ingredients");
+            _menu.StartButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0;
+            _menu.EjectButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0;
+
+            //Set the "micowave light" ui color to indicate if the microwave is busy or not
+            if (cState.IsMicrowaveBusy && cState.ContainedSolids.Length > 0)
+            {
+                _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#947300") };
+            }
+            else
+            {
+                _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#1B1B1E") };
+            }
+        }
+
+        private void RefreshContentsDisplay(EntityUid[] containedSolids)
+        {
+            _reagents.Clear();
+
+            if (_menu == null) return;
+
+            _solids.Clear();
+            _menu.IngredientsList.Clear();
+            foreach (var entity in containedSolids)
+            {
+                if (EntMan.Deleted(entity))
+                {
+                    return;
+                }
+
+                // TODO just use sprite view
+
+                Texture? texture;
+                if (EntMan.TryGetComponent<IconComponent>(entity, out var iconComponent))
+                {
+                    texture = EntMan.System<SpriteSystem>().GetIcon(iconComponent);
+                }
+                else if (EntMan.TryGetComponent<SpriteComponent>(entity, out var spriteComponent))
+                {
+                    texture = spriteComponent.Icon?.Default;
+                }
+                else
+                {
+                    continue;
+                }
+
+                var solidItem = _menu.IngredientsList.AddItem(EntMan.GetComponent<MetaDataComponent>(entity).EntityName, texture);
+                var solidIndex = _menu.IngredientsList.IndexOf(solidItem);
+                _solids.Add(solidIndex, entity);
+            }
+        }
+    }
+}
diff --git a/Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml b/Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml
new file mode 100644
index 00000000000..8de5f2643ee
--- /dev/null
+++ b/Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml
@@ -0,0 +1,95 @@
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:style="clr-namespace:Content.Client.Stylesheets"
+    Title="{Loc 'assembler-menu-title'}"
+    MinWidth="512"
+    MinSize="512 256">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal"  >
+            <PanelContainer
+                Name="IngredientsPanel"
+                Access="Public"
+                MinSize="300 128"
+                Margin="5 5">
+                <PanelContainer.PanelOverride>
+                    <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
+                </PanelContainer.PanelOverride>
+                <ItemList
+                    Name="IngredientsList"
+                    Access="Public"
+                    Margin="5 5"
+                    VerticalExpand="True"
+                    HorizontalExpand="True"
+                    StyleClasses="transparentBackgroundItemList"
+                    SelectMode="Button"
+                    SizeFlagsStretchRatio="3"
+                    ItemSeparation="5"
+                    MinSize="100 128">
+                    <!-- Ingredients are added here by code -->
+                </ItemList>
+            </PanelContainer>
+            <BoxContainer
+                Orientation="Vertical"
+                MinWidth="170"
+                Margin="10 10"
+                VerticalExpand="True"
+                HorizontalExpand="True">
+                <PanelContainer
+                    VerticalExpand="True"
+                    HorizontalExpand="True">
+                    <PanelContainer
+                        VerticalExpand="True"
+                        ModulateSelfOverride="#FF0000"
+                        MinSize="100 256">
+                        <BoxContainer Orientation="Vertical">
+                            <Label
+                                Name="CookTimeInfoLabel"
+                                Access="Public"
+                                Align="Center"
+                                Modulate="#FFFFFF"
+                                VAlign="Center" />
+                            <BoxContainer  Orientation="Vertical">
+                                <BoxContainer
+                                    Orientation="Vertical"
+                                    Align="Center"
+                                    SizeFlagsStretchRatio="3">
+                                    <Control MinSize="0 15" />
+                                    <Button
+                                        Name="StartButton"
+                                        Access="Public"
+                                        Text="{Loc 'assembler-menu-start-button'}"
+                                        StyleClasses="ButtonColorGreen"
+                                        TextAlign="Center" />
+                                    <Button
+                                        Name="EjectButton"
+                                        Access="Public"
+                                        Text="{Loc 'microwave-menu-eject-all-text'}"
+                                        ToolTip="{Loc 'microwave-menu-eject-all-tooltip'}"
+                                        StyleClasses="ButtonColorRed"
+                                        TextAlign="Center" />
+                                </BoxContainer>
+                            </BoxContainer>
+                        </BoxContainer>
+                    </PanelContainer>
+                </PanelContainer>
+            </BoxContainer>
+        </BoxContainer>
+         <!-- Footer -->
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
+                <Label Text="{Loc 'assembler-menu-footer-flavor-left'}" StyleClasses="WindowFooterText" Name="LeftFooter" Access="Public"/>
+                <Label Text="{Loc 'assembler-menu-footer-flavor-right'}" StyleClasses="WindowFooterText"
+                       HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
+                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered" VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+    <PanelContainer Name="DisableCookingPanelOverlay" MouseFilter="Stop">
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BackgroundColor="#1B1B1E66" />
+        </PanelContainer.PanelOverride>
+    </PanelContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml.cs b/Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml.cs
new file mode 100644
index 00000000000..e4ac711c7d4
--- /dev/null
+++ b/Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml.cs
@@ -0,0 +1,44 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+
+namespace Content.Client._NF.Kitchen.UI
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class AssemblerMenu : FancyWindow
+    {
+        [Dependency] private readonly IGameTiming _timing = default!;
+
+        public event Action<BaseButton.ButtonEventArgs, int>? OnCookTimeSelected;
+
+        public bool IsBusy;
+        public TimeSpan CurrentCooktimeEnd;
+
+        public AssemblerMenu()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+        }
+
+        public void ToggleBusyDisableOverlayPanel(bool shouldDisable)
+        {
+            DisableCookingPanelOverlay.Visible = shouldDisable;
+        }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+
+            if (!IsBusy)
+                return;
+
+            if (CurrentCooktimeEnd > _timing.CurTime)
+            {
+                CookTimeInfoLabel.Text = Loc.GetString("assembler-bound-user-interface-cook-time-label",
+                ("time", CurrentCooktimeEnd.Subtract(_timing.CurTime).Seconds));
+            }
+        }
+    }
+}
diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index aeb4cc163fb..c2b0a9727cc 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -38,7 +38,7 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa
             float randomPick = _random.NextFloat();
 
             // if really unlucky, burn card
-            if (randomPick <= 0.15f)
+            if (args.BeingHeated && randomPick <= 0.15f) // Frontier: if not being heated, don't destroy the ID
             {
                 TryComp(uid, out TransformComponent? transformComponent);
                 if (transformComponent != null)
@@ -54,6 +54,13 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa
                 return;
             }
 
+            // Frontier: ID accesses only change with radiation
+            if (!args.BeingIrradiated)
+            {
+                return;
+            }
+            // End Frontier
+
             //Explode if the microwave can't handle it
             if (!micro.CanMicrowaveIdsSafely)
             {
diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
index c0959c8abad..f91a73ce496 100644
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -5,6 +5,10 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Shared.Kitchen; // Frontier
+using Robust.Shared.Serialization; // Frontier
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Content.Shared.Kitchen.Components; // Frontier
 
 namespace Content.Server.Kitchen.Components
 {
@@ -115,17 +119,61 @@ public sealed partial class MicrowaveComponent : Component
         /// </summary>
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public bool CanMicrowaveIdsSafely = true;
+
+        // Frontier: recipe type
+        /// <summary>
+        /// the types of recipes that this "microwave" can handle.
+        /// </summary>
+        [DataField(customTypeSerializer: typeof(FlagSerializer<MicrowaveRecipeTypeFlags>)), ViewVariables(VVAccess.ReadWrite)]
+        public int ValidRecipeTypes = (int)MicrowaveRecipeType.Microwave;
+
+        /// <summary>
+        /// If true, events sent off by the microwave will state that the object is being heated.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public bool CanHeat = true;
+
+        /// <summary>
+        /// If true, events sent off by the microwave will state that the object is being irradiated.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public bool CanIrradiate = true;
+
+        /// <summary>
+        /// The localization string to be displayed when something that's too large is inserted.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public string TooBigPopup = "microwave-component-interact-item-too-big";
+
+        /// <summary>
+        /// The sound that is played when a set of ingredients does not match an assembly recipe.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public SoundSpecifier NoRecipeSound = new SoundPathSpecifier("/Audio/Effects/Cargo/buzz_sigh.ogg");
+
+        /// <summary>
+        /// The sound that is played when a set of ingredients does not match an assembly recipe.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadOnly)]
+        public MicrowaveUiKey Key = MicrowaveUiKey.Key;
+        // End Frontier
     }
 
     public sealed class BeingMicrowavedEvent : HandledEntityEventArgs
     {
         public EntityUid Microwave;
         public EntityUid? User;
+        // Frontier: fields for whether or not the object is actually being heated or irradiated.
+        public bool BeingHeated;
+        public bool BeingIrradiated;
+        // End Frontier
 
-        public BeingMicrowavedEvent(EntityUid microwave, EntityUid? user)
+        public BeingMicrowavedEvent(EntityUid microwave, EntityUid? user, bool heating, bool irradiating) // Frontier: added heating, irradiating
         {
             Microwave = microwave;
             User = user;
+            BeingHeated = heating;
+            BeingIrradiated = irradiating;
         }
     }
 }
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 1c2b48ba8ef..ab0cb33bb0c 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -41,10 +41,11 @@
 using Content.Shared.Chat;
 using Content.Shared.Damage;
 using Robust.Shared.Utility;
+using Content.Shared._NF.Kitchen.Components; // Frontier
 
 namespace Content.Server.Kitchen.EntitySystems
 {
-    public sealed class MicrowaveSystem : EntitySystem
+    public sealed partial class MicrowaveSystem : EntitySystem // Frontier: add partial
     {
         [Dependency] private readonly BodySystem _bodySystem = default!;
         [Dependency] private readonly DeviceLinkSystem _deviceLink = default!;
@@ -102,10 +103,13 @@ public override void Initialize()
             SubscribeLocalEvent<ActiveMicrowaveComponent, EntRemovedFromContainerMessage>(OnActiveMicrowaveRemove);
 
             SubscribeLocalEvent<ActivelyMicrowavedComponent, OnConstructionTemperatureEvent>(OnConstructionTemp);
+
             SubscribeLocalEvent<FoodRecipeProviderComponent, GetSecretRecipesEvent>(OnGetSecretRecipes);
-            
+
             SubscribeLocalEvent<MicrowaveComponent, RefreshPartsEvent>(OnRefreshParts); // Frontier
             SubscribeLocalEvent<MicrowaveComponent, UpgradeExamineEvent>(OnUpgradeExamine); // Frontier
+
+            SubscribeLocalEvent<MicrowaveComponent, AssemblerStartCookMessage>(TryStartAssembly); // Frontier
         }
 
         private void OnCookStart(Entity<ActiveMicrowaveComponent> ent, ref ComponentStartup args)
@@ -151,6 +155,11 @@ private void OnConstructionTemp(Entity<ActivelyMicrowavedComponent> ent, ref OnC
         /// <param name="time">The time on the microwave, in seconds.</param>
         private void AddTemperature(MicrowaveComponent component, float time)
         {
+            // Frontier: temperature requires heat or irradiation
+            if (!component.CanHeat && !component.CanIrradiate)
+                return;
+            // End Frontier
+
             var heatToAdd = time * component.BaseHeatMultiplier;
             foreach (var entity in component.Storage.ContainedEntities)
             {
@@ -282,6 +291,11 @@ private void OnSuicideByEnvironment(Entity<MicrowaveComponent> ent, ref SuicideB
             if (!TryComp<DamageableComponent>(args.Victim, out var damageableComponent))
                 return;
 
+            // Frontier: suicide requires heat or irradiation
+            if (!ent.Comp.CanHeat && !ent.Comp.CanIrradiate)
+                return;
+            // Frontier
+
             // The application of lethal damage is what kills you...
             _suicide.ApplyLethalDamage((args.Victim, damageableComponent), "Heat");
 
@@ -380,7 +394,7 @@ private void OnInteractUsing(Entity<MicrowaveComponent> ent, ref InteractUsingEv
                 // check if size of an item you're trying to put in is too big
                 if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(ent.Comp.MaxItemSize))
                 {
-                    _popupSystem.PopupEntity(Loc.GetString("microwave-component-interact-item-too-big", ("item", args.Used)), ent, args.User);
+                    _popupSystem.PopupEntity(Loc.GetString(ent.Comp.TooBigPopup, ("item", args.Used)), ent, args.User); // Frontier: "microwave-component-interact-item-too-big"<ent.Comp.TooBigPopup
                     return;
                 }
             }
@@ -451,7 +465,7 @@ private void OnSignalReceived(Entity<MicrowaveComponent> ent, ref SignalReceived
 
         public void UpdateUserInterfaceState(EntityUid uid, MicrowaveComponent component)
         {
-            _userInterface.SetUiState(uid, MicrowaveUiKey.Key, new MicrowaveUpdateUserInterfaceState(
+            _userInterface.SetUiState(uid, component.Key, new MicrowaveUpdateUserInterfaceState(
                 GetNetEntityArray(component.Storage.ContainedEntities.ToArray()),
                 HasComp<ActiveMicrowaveComponent>(uid),
                 component.CurrentCookTimeButtonIndex,
@@ -534,7 +548,7 @@ public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user
             foreach (var item in component.Storage.ContainedEntities.ToArray())
             {
                 // special behavior when being microwaved ;)
-                var ev = new BeingMicrowavedEvent(uid, user);
+                var ev = new BeingMicrowavedEvent(uid, user, component.CanHeat, component.CanIrradiate); // Frontier: add CanHeat, CanIrradiate
                 RaiseLocalEvent(item, ev);
 
                 if (ev.Handled)
@@ -543,12 +557,12 @@ public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user
                     return;
                 }
 
-                if (_tag.HasTag(item, "Metal"))
+                if (_tag.HasTag(item, "Metal") && component.CanIrradiate) // Frontier: add && !component.DisableMetalMalfunctions
                 {
                     malfunctioning = true;
                 }
 
-                if (_tag.HasTag(item, "Plastic"))
+                if (_tag.HasTag(item, "Plastic") && (component.CanHeat || component.CanIrradiate)) // Frontier: add && !component.DisableRuiningPlastic
                 {
                     var junk = Spawn(component.BadRecipeEntityId, Transform(uid).Coordinates);
                     _container.Insert(junk, component.Storage);
@@ -645,6 +659,13 @@ public static (FoodRecipePrototype, int) CanSatisfyRecipe(MicrowaveComponent com
                 return (recipe, 0);
             }
 
+            // Frontier: microwave recipe machine types
+            if ((recipe.RecipeType & component.ValidRecipeTypes) == 0)
+            {
+                return (recipe, 0);
+            }
+            // End Frontier
+
             foreach (var solid in recipe.IngredientsSolids)
             {
                 if (!solids.ContainsKey(solid.Key))
diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs
index 0cdb0bc29a2..0d80f53bf35 100644
--- a/Content.Server/PAI/PAISystem.cs
+++ b/Content.Server/PAI/PAISystem.cs
@@ -65,6 +65,11 @@ private void OnMindRemoved(EntityUid uid, PAIComponent component, MindRemovedMes
 
     private void OnMicrowaved(EntityUid uid, PAIComponent comp, BeingMicrowavedEvent args)
     {
+        // Frontier: only scramble pAI names when irradiated
+        if (!args.BeingIrradiated)
+            return;
+        // End Frontier
+
         // name will always be scrambled whether it gets bricked or not, this is the reward
         ScrambleName(uid, comp);
 
diff --git a/Content.Server/Power/EntitySystems/RiggableSystem.cs b/Content.Server/Power/EntitySystems/RiggableSystem.cs
index 26eaca80fe7..b40fc06718c 100644
--- a/Content.Server/Power/EntitySystems/RiggableSystem.cs
+++ b/Content.Server/Power/EntitySystems/RiggableSystem.cs
@@ -31,6 +31,11 @@ private void OnRejuvenate(Entity<RiggableComponent> entity, ref RejuvenateEvent
 
     private void OnMicrowaved(Entity<RiggableComponent> entity, ref BeingMicrowavedEvent args)
     {
+        // Frontier: don't do anything if machine doesn't heat or irradiate.
+        if (!args.BeingHeated && !args.BeingIrradiated)
+            return;
+        // End Frontier
+
         if (TryComp<BatteryComponent>(entity, out var batteryComponent))
         {
             if (batteryComponent.CurrentCharge == 0)
diff --git a/Content.Server/Temperature/Components/EntityHeaterComponent.cs b/Content.Server/Temperature/Components/EntityHeaterComponent.cs
index 0b5acb421a8..34b3cc3a2d8 100644
--- a/Content.Server/Temperature/Components/EntityHeaterComponent.cs
+++ b/Content.Server/Temperature/Components/EntityHeaterComponent.cs
@@ -23,6 +23,14 @@ public sealed partial class EntityHeaterComponent : Component
     [DataField]
     public EntityHeaterSetting Setting = EntityHeaterSetting.Off;
 
+    // Frontier: ghost power
+    /// <summary>
+    /// Passive power draw.  Takes this much while plugged in, even when off.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float PassivePower = 0f;
+    // End Frontier
+
     /// <summary>
     /// An optional sound that plays when the setting is changed.
     /// </summary>
diff --git a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs
index c4b5b72a9cb..62f0eb08eac 100644
--- a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs
+++ b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs
@@ -42,7 +42,7 @@ public override void Update(float deltaTime)
             // don't divide by total entities since its a big grill
             // excess would just be wasted in the air but that's not worth simulating
             // if you want a heater thermomachine just use that...
-            var energy = power.PowerReceived * deltaTime;
+            var energy = (power.PowerReceived - comp.PassivePower) * deltaTime; // Frontier: subtract PassivePower
             foreach (var ent in placer.PlacedEntities)
             {
                 _temperature.ChangeHeat(ent, energy);
@@ -93,7 +93,7 @@ private void ChangeSetting(EntityUid uid, EntityHeaterSetting setting, EntityHea
             return;
 
         comp.Setting = setting;
-        power.Load = SettingPower(setting, comp.Power);
+        power.Load = comp.PassivePower + SettingPower(setting, comp.Power); // Frontier: add PassivePower
         _appearance.SetData(uid, EntityHeaterVisuals.Setting, setting);
         _audio.PlayPvs(comp.SettingSound, uid);
     }
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMicrowaveTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMicrowaveTriggerSystem.cs
index ca61c8f8ab3..638a0f2603a 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMicrowaveTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMicrowaveTriggerSystem.cs
@@ -15,6 +15,11 @@ public override void Initialize()
 
     private void OnMicrowaved(EntityUid uid, ArtifactMicrowaveTriggerComponent component, BeingMicrowavedEvent args)
     {
+        // Frontier: microwave trigger requires radiation, check if this can irradiate
+        if (!args.BeingIrradiated)
+            return;
+        // End Frontier
+
         _artifact.TryActivateArtifact(uid);
     }
 }
diff --git a/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeComponent.cs b/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeComponent.cs
new file mode 100644
index 00000000000..d0b99f29152
--- /dev/null
+++ b/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeComponent.cs
@@ -0,0 +1,23 @@
+using Content.Shared.CartridgeLoader.Cartridges;
+using Robust.Shared.Audio;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+[RegisterComponent]
+public sealed partial class AppraisalCartridgeComponent : Component
+{
+    /// <summary>
+    /// The list of appraised items
+    /// </summary>
+    [DataField("appraisedItems")]
+    public List<AppraisedItem> AppraisedItems = new();
+
+    /// <summary>
+    /// Limits the amount of items that can be saved
+    /// </summary>
+    [DataField("maxSavedItems")]
+    public int MaxSavedItems { get; set; } = 9;
+
+    [DataField("soundScan")]
+    public SoundSpecifier SoundScan = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg");
+}
diff --git a/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeSystem.cs b/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeSystem.cs
new file mode 100644
index 00000000000..0e9973aae97
--- /dev/null
+++ b/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeSystem.cs
@@ -0,0 +1,105 @@
+using Content.Server.Cargo.Systems;
+using Content.Shared.Audio;
+using Content.Shared.CartridgeLoader;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.Popups;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Content.Server.Cargo.Components;
+using Content.Shared.Timing;
+
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+public sealed class AppraisalCartridgeSystem : EntitySystem
+{
+    [Dependency] private readonly CargoSystem _bountySystem = default!;
+    [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly PricingSystem _pricingSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<AppraisalCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
+        SubscribeLocalEvent<AppraisalCartridgeComponent, CartridgeAfterInteractEvent>(AfterInteract);
+        SubscribeLocalEvent<AppraisalCartridgeComponent, CartridgeActivatedEvent>(OnCartridgeActivated);
+        SubscribeLocalEvent<AppraisalCartridgeComponent, CartridgeDeactivatedEvent>(OnCartridgeDeactivated);
+    }
+
+    // Kinda jank, but easiest way to get the right-click Appraisal verb to also work.
+    // I'd much rather pass the GetUtilityVerb event through to the AppraisalCartridgeSystem and have all of
+    // the functionality in there, rather than adding a PriceGunComponent to the PDA itself, but getting
+    // that passthrough to work is not a straightforward thing.
+
+    // Because of this weird workaround, items appraised with the right-click utility verb don't get added
+    // to the history in the UI. That'll be something to revisit someday if anyone notices and complains :P
+
+    // Doing this on cartridge activation and deactivation rather than install and remove so that the price
+    // gun functionality is only there when the program is active.
+    private void OnCartridgeActivated(Entity<AppraisalCartridgeComponent> ent, ref CartridgeActivatedEvent args)
+    {
+        EnsureComp<PriceGunComponent>(args.Loader);
+        // PriceGunSystem methods exit early if a DelayComponent is not present
+        EnsureComp<UseDelayComponent>(args.Loader);
+    }
+
+    private void OnCartridgeDeactivated(Entity<AppraisalCartridgeComponent> ent, ref CartridgeDeactivatedEvent args)
+    {
+        var parent = Transform(args.Loader).ParentUid;
+        RemComp<PriceGunComponent>(parent);
+        RemComp<UseDelayComponent>(parent);
+    }
+
+    /// <summary>
+    /// The <see cref="CartridgeAfterInteractEvent" /> gets relayed to this system if the cartridge loader is running
+    /// the Appraisal program and someone clicks on something with it. <br/>
+    /// <br/>
+    /// Does the thing... TODO
+    /// </summary>
+    private void AfterInteract(EntityUid uid, AppraisalCartridgeComponent component, CartridgeAfterInteractEvent args)
+    {
+        if (args.InteractEvent.Handled || !args.InteractEvent.CanReach || !args.InteractEvent.Target.HasValue)
+            return;
+
+        var target = args.InteractEvent.Target;
+        var who = args.InteractEvent.User;
+        double price = 0.00;
+
+        // All of the pop up display stuff is being handled by the PriceGunComponent addded to the PDA,
+        // all we're doing in here is getting the price and recording it to the PDA interface bit.
+        price = _pricingSystem.GetPrice(target.Value);
+
+        //Limit the amount of saved probe results to 9
+        //This is hardcoded because the UI doesn't support a dynamic number of results
+        if (component.AppraisedItems.Count >= component.MaxSavedItems)
+            component.AppraisedItems.RemoveAt(0);
+
+        var item = new AppraisedItem(
+            Name(target.Value),
+            price.ToString("0.00")
+        );
+
+        component.AppraisedItems.Add(item);
+        UpdateUiState(uid, args.Loader, component);
+    }
+
+    /// <summary>
+    /// This gets called when the ui fragment needs to be updated for the first time after activating
+    /// </summary>
+    private void OnUiReady(EntityUid uid, AppraisalCartridgeComponent component, CartridgeUiReadyEvent args)
+    {
+        UpdateUiState(uid, args.Loader, component);
+    }
+
+    private void UpdateUiState(EntityUid uid, EntityUid loaderUid, AppraisalCartridgeComponent? component)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        var state = new AppraisalUiState(component.AppraisedItems);
+        _cartridgeLoaderSystem?.UpdateCartridgeUiState(loaderUid, state);
+    }
+}
diff --git a/Content.Server/_NF/Kitchen/EntitySystems/MicrowaveSystem.Assembler.cs b/Content.Server/_NF/Kitchen/EntitySystems/MicrowaveSystem.Assembler.cs
new file mode 100644
index 00000000000..7eecc3eea4b
--- /dev/null
+++ b/Content.Server/_NF/Kitchen/EntitySystems/MicrowaveSystem.Assembler.cs
@@ -0,0 +1,181 @@
+
+// Overlaps with existing namespace.
+using System.Linq;
+using Content.Server.Kitchen.Components;
+using Content.Server.Power.Components;
+using Content.Shared._NF.Kitchen.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.FixedPoint;
+using Content.Shared.Kitchen;
+using Content.Shared.Stacks;
+
+namespace Content.Server.Kitchen.EntitySystems;
+
+public sealed partial class MicrowaveSystem : EntitySystem
+{
+    /// <summary>
+    /// Runs a set of minimal pre-reqs to check the timing, needed to enable dummy-proof, one-button interface to Wzhzhzh
+    /// </summary>
+    public void TryStartAssembly(EntityUid uid, MicrowaveComponent component, AssemblerStartCookMessage args)
+    {
+        if (!HasContents(component) || HasComp<ActiveMicrowaveComponent>(uid) || !(TryComp<ApcPowerReceiverComponent>(uid, out var apc) && apc.Powered))
+            return;
+
+        var user = args.Actor;
+
+        var solidsDict = new Dictionary<string, int>();
+        var reagentDict = new Dictionary<string, FixedPoint2>();
+        var malfunctioning = false;
+        // TODO use lists of Reagent quantities instead of reagent prototype ids.
+        foreach (var item in component.Storage.ContainedEntities.ToArray())
+        {
+            string? solidID = null;
+            int amountToAdd = 1;
+
+            // If a microwave recipe uses a stacked item, use the default stack prototype id instead of prototype id
+            if (TryComp<StackComponent>(item, out var stackComp))
+            {
+                solidID = _prototype.Index<StackPrototype>(stackComp.StackTypeId).Spawn;
+                amountToAdd = stackComp.Count;
+            }
+            else
+            {
+                var metaData = MetaData(item); //this simply begs for cooking refactor
+                if (metaData.EntityPrototype is not null)
+                    solidID = metaData.EntityPrototype.ID;
+            }
+
+            if (solidID is null)
+            {
+                continue;
+            }
+
+
+            if (solidsDict.ContainsKey(solidID))
+            {
+                solidsDict[solidID] += amountToAdd;
+            }
+            else
+            {
+                solidsDict.Add(solidID, amountToAdd);
+            }
+
+            if (!TryComp<SolutionContainerManagerComponent>(item, out var solMan))
+                continue;
+
+            foreach (var (_, soln) in _solutionContainer.EnumerateSolutions((item, solMan)))
+            {
+                var solution = soln.Comp.Solution;
+                foreach (var (reagent, quantity) in solution.Contents)
+                {
+                    if (reagentDict.ContainsKey(reagent.Prototype))
+                        reagentDict[reagent.Prototype] += quantity;
+                    else
+                        reagentDict.Add(reagent.Prototype, quantity);
+                }
+            }
+        }
+
+        // Check recipes
+        var getRecipesEv = new GetSecretRecipesEvent();
+        RaiseLocalEvent(uid, ref getRecipesEv);
+
+        List<FoodRecipePrototype> recipes = getRecipesEv.Recipes;
+        recipes.AddRange(_recipeManager.Recipes);
+        var portionedRecipe = recipes.Select(r =>
+            GetPortionsForRecipe(component, r, solidsDict, reagentDict)).FirstOrDefault(r => r.Item2 > 0);
+
+        if (portionedRecipe.Item2 <= 0)
+        {
+            // Display popup
+            _popupSystem.PopupEntity(Loc.GetString("microwave-component-assembler-no-valid-recipe"), uid);
+            _audio.PlayPvs(component.NoRecipeSound, uid);
+            return;
+        }
+
+        // We're actually microwaving things, run the wzhzhzh checks
+        foreach (var item in component.Storage.ContainedEntities.ToArray())
+        {
+            var ev = new BeingMicrowavedEvent(uid, user, component.CanHeat, component.CanIrradiate);
+            RaiseLocalEvent(item, ev);
+
+            if (ev.Handled)
+            {
+                UpdateUserInterfaceState(uid, component);
+                return;
+            }
+
+            if (_tag.HasTag(item, "Metal") && component.CanIrradiate)
+            {
+                malfunctioning = true;
+            }
+
+            if (_tag.HasTag(item, "Plastic") && (component.CanHeat || component.CanIrradiate))
+            {
+                var junk = Spawn(component.BadRecipeEntityId, Transform(uid).Coordinates);
+                _container.Insert(junk, component.Storage);
+                Del(item);
+                continue;
+            }
+
+            AddComp<ActivelyMicrowavedComponent>(item);
+        }
+
+        _audio.PlayPvs(component.StartCookingSound, uid);
+        var activeComp = AddComp<ActiveMicrowaveComponent>(uid); //microwave is now cooking
+        component.CurrentCookTimerTime = (uint)portionedRecipe.Item2 * portionedRecipe.Item1.CookTime;
+        activeComp.CookTimeRemaining = component.CurrentCookTimerTime * component.FinalCookTimeMultiplier; // Frontier: CookTimeMultiplier<FinalCookTimeMultiplier
+        activeComp.TotalTime = component.CurrentCookTimerTime; //this doesn't scale so that we can have the "actual" time
+        activeComp.PortionedRecipe = portionedRecipe;
+        //Scale times with cook times
+        component.CurrentCookTimeEnd = _gameTiming.CurTime + TimeSpan.FromSeconds(component.CurrentCookTimerTime * component.FinalCookTimeMultiplier); // Frontier: CookTimeMultiplier<FinalCookTimeMultiplier
+        if (malfunctioning)
+            activeComp.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.MalfunctionInterval);
+        UpdateUserInterfaceState(uid, component);
+    }
+
+    /// <summary>
+    /// Frontier: gets the largest number of portions
+    /// </summary>
+    public static (FoodRecipePrototype, int) GetPortionsForRecipe(MicrowaveComponent component, FoodRecipePrototype recipe, Dictionary<string, int> solids, Dictionary<string, FixedPoint2> reagents)
+    {
+        var portions = 0;
+
+        // Frontier: microwave recipe machine types
+        if ((recipe.RecipeType & component.ValidRecipeTypes) == 0)
+        {
+            return (recipe, 0);
+        }
+        // End Frontier
+
+        foreach (var solid in recipe.IngredientsSolids)
+        {
+            if (!solids.ContainsKey(solid.Key))
+                return (recipe, 0);
+
+            if (solids[solid.Key] < solid.Value)
+                return (recipe, 0);
+
+            portions = portions == 0
+                ? solids[solid.Key] / solid.Value.Int()
+                : Math.Min(portions, solids[solid.Key] / solid.Value.Int());
+        }
+
+        foreach (var reagent in recipe.IngredientsReagents)
+        {
+            // TODO Turn recipe.IngredientsReagents into a ReagentQuantity[]
+            if (!reagents.ContainsKey(reagent.Key))
+                return (recipe, 0);
+
+            if (reagents[reagent.Key] < reagent.Value)
+                return (recipe, 0);
+
+            portions = portions == 0
+                ? reagents[reagent.Key].Int() / reagent.Value.Int()
+                : Math.Min(portions, reagents[reagent.Key].Int() / reagent.Value.Int());
+        }
+
+        //Return as many portions as we can assemble with the given materials
+        return (recipe, portions);
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/Kitchen/Components/SharedMicrowave.cs b/Content.Shared/Kitchen/Components/SharedMicrowave.cs
index fa123689841..8c3405eea3c 100644
--- a/Content.Shared/Kitchen/Components/SharedMicrowave.cs
+++ b/Content.Shared/Kitchen/Components/SharedMicrowave.cs
@@ -80,7 +80,10 @@ public enum MicrowaveVisualState
     [NetSerializable, Serializable]
     public enum MicrowaveUiKey
     {
-        Key
+        Key,
+        ElectricRangeKey, // Frontier
+        AssemblerKey, // Frontier
+        MedicalAssemblerKey, // Frontier
     }
 
 }
diff --git a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
index adb8867e30a..7d5d8661f92 100644
--- a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
+++ b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
@@ -3,6 +3,8 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization; // Frontier
 
 namespace Content.Shared.Kitchen
 {
@@ -36,6 +38,11 @@ public sealed partial class FoodRecipePrototype : IPrototype
         [DataField("time")]
         public uint CookTime { get; private set; } = 5;
 
+        // Frontier: separate microwave recipe types.
+
+        [DataField("recipeType", customTypeSerializer: typeof(FlagSerializer<MicrowaveRecipeTypeFlags>))]
+        public int RecipeType = (int)MicrowaveRecipeType.Microwave;
+
         public string Name => Loc.GetString(_name);
 
         // TODO Turn this into a ReagentQuantity[]
@@ -64,4 +71,17 @@ public FixedPoint2 IngredientCount()
             return n;
         }
     }
+
+    // Frontier: microwave recipe types, to limit certain recipes to certain machines
+    [Flags, FlagsFor(typeof(MicrowaveRecipeTypeFlags))]
+    [Serializable, NetSerializable]
+    public enum MicrowaveRecipeType : int
+    {
+        Microwave = 1,
+        Oven = 2,
+        Assembler = 4,
+        MedicalAssembler = 8,
+    }
+
+    public sealed class MicrowaveRecipeTypeFlags { }
 }
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index 32f5db0e821..098a5e8b4d9 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -15,6 +15,7 @@ public sealed partial class ContentTileDefinition : IPrototype, IInheritingProto
     {
         [ValidatePrototypeId<ToolQualityPrototype>]
         public const string PryingToolQuality = "Prying";
+        public const string DiggingToolQuality = "Digging"; // Frontier
 
         public const string SpaceID = "Space";
 
@@ -46,13 +47,14 @@ public sealed partial class ContentTileDefinition : IPrototype, IInheritingProto
         public PrototypeFlags<ToolQualityPrototype> DeconstructTools { get; set; } = new();
 
         // Delta V
-        [DataField("canShovel")] public bool CanShovel { get; private set; }
+        // [DataField("canShovel")] public bool CanShovel { get; private set; }
         //Delta V
 
         /// <remarks>
         /// Legacy AF but nice to have.
         /// </remarks>
         public bool CanCrowbar => DeconstructTools.Contains(PryingToolQuality);
+        public bool CanShovel => DeconstructTools.Contains(DiggingToolQuality); // Frontier
 
         /// <summary>
         /// These play when the mob has shoes on.
diff --git a/Content.Shared/Placeable/ItemPlacerComponent.cs b/Content.Shared/Placeable/ItemPlacerComponent.cs
index 84df2e395a8..1897e033d5a 100644
--- a/Content.Shared/Placeable/ItemPlacerComponent.cs
+++ b/Content.Shared/Placeable/ItemPlacerComponent.cs
@@ -29,4 +29,10 @@ public sealed partial class ItemPlacerComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public uint MaxEntities = 1;
+
+    /// <summary>
+    /// Frontier: track old placeable status
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public bool? LastPlaceable;
 }
diff --git a/Content.Shared/Placeable/ItemPlacerSystem.cs b/Content.Shared/Placeable/ItemPlacerSystem.cs
index d1ea88b82a0..51d72eb88e4 100644
--- a/Content.Shared/Placeable/ItemPlacerSystem.cs
+++ b/Content.Shared/Placeable/ItemPlacerSystem.cs
@@ -42,6 +42,8 @@ private void OnStartCollide(EntityUid uid, ItemPlacerComponent comp, ref StartCo
         if (comp.MaxEntities > 0 && count >= (comp.MaxEntities - 1))
         {
             // Don't let any more items be placed if it's reached its limit.
+            if (TryComp<PlaceableSurfaceComponent>(uid, out var placeable)) // Frontier: cache last placeable status
+                comp.LastPlaceable = placeable.IsPlaceable; // Frontier
             _placeableSurface.SetPlaceable(uid, false);
         }
     }
@@ -56,7 +58,14 @@ private void OnEndCollide(EntityUid uid, ItemPlacerComponent comp, ref EndCollid
         var ev = new ItemRemovedEvent(args.OtherEntity);
         RaiseLocalEvent(uid, ref ev);
 
-        _placeableSurface.SetPlaceable(uid, true);
+        // Frontier: reset placeable status to last known value
+        if (comp.LastPlaceable != null)
+        {
+            _placeableSurface.SetPlaceable(uid, comp.LastPlaceable.Value);
+            comp.LastPlaceable = null;
+        }
+        // End Frontier
+        //_placeableSurface.SetPlaceable(uid, true); // Frontier
     }
 }
 
diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
index 426b991a751..83570244fc8 100644
--- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using Content.Shared.Construction.Prototypes;
 using Content.Shared.DeviceLinking;
 using Robust.Shared.GameStates;
@@ -39,7 +39,7 @@ public sealed partial class EmitterComponent : Component
     /// The current amount of power being used.
     /// </summary>
     [DataField("powerUseActive")]
-    public int PowerUseActive = 600;
+    public int PowerUseActive = 1500; // Frontier 600<1500
 
     /// <summary>
     /// The amount of shots that are fired in a single "burst"
diff --git a/Content.Shared/_NF/CartridgeLoader/Cartridges/AppraisalUiState.cs b/Content.Shared/_NF/CartridgeLoader/Cartridges/AppraisalUiState.cs
new file mode 100644
index 00000000000..41b9ed09477
--- /dev/null
+++ b/Content.Shared/_NF/CartridgeLoader/Cartridges/AppraisalUiState.cs
@@ -0,0 +1,30 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CartridgeLoader.Cartridges;
+
+[Serializable, NetSerializable]
+public sealed class AppraisalUiState : BoundUserInterfaceState
+{
+    /// <summary>
+    /// The list of appraised items
+    /// </summary>
+    public List<AppraisedItem> AppraisedItems;
+
+    public AppraisalUiState(List<AppraisedItem> appraisedItems)
+    {
+        AppraisedItems = appraisedItems;
+    }
+}
+
+[Serializable, NetSerializable, DataRecord]
+public sealed class AppraisedItem
+{
+    public readonly string Name;
+    public readonly string AppraisedPrice;
+
+    public AppraisedItem(string name, string appraisedPrice)
+    {
+        Name = name;
+        AppraisedPrice = appraisedPrice;
+    }
+}
diff --git a/Content.Shared/_NF/Kitchen/Components/SharedMicrowave.Assembler.cs b/Content.Shared/_NF/Kitchen/Components/SharedMicrowave.Assembler.cs
new file mode 100644
index 00000000000..7af57164ee9
--- /dev/null
+++ b/Content.Shared/_NF/Kitchen/Components/SharedMicrowave.Assembler.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._NF.Kitchen.Components;
+
+[Serializable, NetSerializable]
+public sealed class AssemblerStartCookMessage : BoundUserInterfaceMessage
+{
+}
+
diff --git a/Resources/Audio/_NF/Effects/attributions.yml b/Resources/Audio/_NF/Effects/attributions.yml
index 0eac2cd636a..f1a3e96ae36 100644
--- a/Resources/Audio/_NF/Effects/attributions.yml
+++ b/Resources/Audio/_NF/Effects/attributions.yml
@@ -6,4 +6,4 @@
 - files: ["splat.ogg"]
   license: "CC0-1.0"
   copyright: "Modified by 'dvir001' from 'pixabay' . The original audio was converted from WAV to OGG format"
-  source: "https://pixabay.com/sound-effects/cartoon-splat-6086/"
\ No newline at end of file
+  source: "https://pixabay.com/sound-effects/cartoon-splat-6086/"
diff --git a/Resources/Audio/_NF/Machines/assembler.ogg b/Resources/Audio/_NF/Machines/assembler.ogg
new file mode 100644
index 00000000000..05e10088866
Binary files /dev/null and b/Resources/Audio/_NF/Machines/assembler.ogg differ
diff --git a/Resources/Audio/_NF/Machines/attributions.yml b/Resources/Audio/_NF/Machines/attributions.yml
new file mode 100644
index 00000000000..b877c603c57
--- /dev/null
+++ b/Resources/Audio/_NF/Machines/attributions.yml
@@ -0,0 +1,14 @@
+- files: ["assembler.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Modified by whatston3 from 'Swirling EM Fields Loop' by nlux"
+  source: "https://freesound.org/people/nlux/sounds/620807/"
+
+- files: ["egg-timer.ogg"]
+  license: "CC0-1.0"
+  copyright: "Uploaded by 'xyzr_kx' to freesound.org, converted to OGG from MP3."
+  source: "https://freesound.org/people/xyzr_kx/sounds/14263/"
+
+- files: ["medical-assembler.ogg"]
+  license: "CC0-1.0"
+  copyright: "Composited by whatston3 from 'Paper Cutter 1.wav' from Brotherprovisional on freesound.org (see source) and '50Hz_Hum' from nicola_ariutti at https://freesound.org/people/nicola_ariutti/sounds/335365/"
+  source: "https://freesound.org/people/Brotherprovisional/sounds/38889/"
\ No newline at end of file
diff --git a/Resources/Audio/_NF/Machines/egg-timer.ogg b/Resources/Audio/_NF/Machines/egg-timer.ogg
new file mode 100644
index 00000000000..e8fe2d4a270
Binary files /dev/null and b/Resources/Audio/_NF/Machines/egg-timer.ogg differ
diff --git a/Resources/Audio/_NF/Machines/medical-assembler.ogg b/Resources/Audio/_NF/Machines/medical-assembler.ogg
new file mode 100644
index 00000000000..0c472ebf4c6
Binary files /dev/null and b/Resources/Audio/_NF/Machines/medical-assembler.ogg differ
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 586033807c1..289e575c24c 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -4411,3 +4411,98 @@ Entries:
       message: Added filled medicine and chemistry Frontier wall lockers.
   id: 5382
   time: '2024-10-12T16:29:52.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Opporozidone recipe uses Mannitol instead of Cognizine.
+  id: 5383
+  time: '2024-10-12T17:54:51.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Replace Beaker tiny fans with directional fans.
+  id: 5384
+  time: '2024-10-12T18:07:40.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Updated Honker tiny fans with directional fans.
+  id: 5385
+  time: '2024-10-12T18:10:44.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Replace Sparrow tiny fans with directional fans.
+  id: 5386
+  time: '2024-10-12T18:16:45.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Tweak
+      message: >-
+        Removed the lock from emitters, fixed the emitters to no longer work
+        like the PTK-800 for mining.
+  id: 5387
+  time: '2024-10-12T18:32:27.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Add
+      message: >-
+        The Food-O-Mat and electric range are now available to assemble and bake
+        food.  A medical assembler has been added for aloe cream and topical
+        recipes.
+    - type: Add
+      message: >-
+        A tier 2 civilian research now unlocks the fryer, Food-O-Mat and range,
+        and another unlocks the medical assembler.
+    - type: Tweak
+      message: >-
+        Many microwave recipes now use the range and Food-O-Mat.  Refer to the
+        Food Recipes Guidebook page for details.
+    - type: Remove
+      message: The medical techfab recipes for advanced topicals have been removed.
+  id: 5388
+  time: '2024-10-12T19:26:32.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Replaces Anchor tiny fans with directional fans.
+  id: 5389
+  time: '2024-10-13T04:33:04.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Replaces Falcon tiny fan with directional fans.
+  id: 5390
+  time: '2024-10-13T04:38:27.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Updated Schooner with directional fans.
+  id: 5391
+  time: '2024-10-13T04:43:32.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Add
+      message: Added an appraisal program cartridge for PDAs
+  id: 5392
+  time: '2024-10-13T04:50:29.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: >-
+        Replaced Marauder tiny fans with directional fans. Added a fan to the
+        forward airlock. Added some atmos tools to the atmos room.
+  id: 5393
+  time: '2024-10-13T04:51:02.0000000+00:00'
+- author: PeccNeck
+  changes:
+    - type: Fix
+      message: Fixed Shovel instantly digging on cancel
+  id: 5394
+  time: '2024-10-13T05:43:10.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Adds carpets to the tile cutter.
+  id: 5395
+  time: '2024-10-13T05:45:27.0000000+00:00'
diff --git a/Resources/Locale/en-US/_EE/guidebook/food.ftl b/Resources/Locale/en-US/_EE/guidebook/food.ftl
index b7e7ea5d703..948ca171fba 100644
--- a/Resources/Locale/en-US/_EE/guidebook/food.ftl
+++ b/Resources/Locale/en-US/_EE/guidebook/food.ftl
@@ -10,7 +10,8 @@ guidebook-food-reagents-header = Nutritional Value
 
 guidebook-food-processing-butchering = Butcher
 guidebook-food-processing-slicing = Slice
-guidebook-food-processing-cooking = Microwave for {$time}s
+# Frontier: Microwave<Cook (multiple machine types)
+guidebook-food-processing-cooking = {CAPITALIZE($processingTypes)} for {$time}s
 guidebook-food-processing-reaction = Mix
 
 guidebook-food-processing-recipe = {$ingredients}
@@ -18,3 +19,11 @@ guidebook-food-ingredient-solid = [bold]{$name}[/bold] \[{$amount}\]
 guidebook-food-ingredient-liquid = [bold]{$name}[/bold] \[{$amount}u\]
 
 guidebook-food-output = [bold]{$name}[/bold] \[{$number}\]
+
+# Frontier: processing types
+guidebook-food-processing-type-microwave = microwave
+guidebook-food-processing-type-oven = bake
+guidebook-food-processing-type-assembler = assemble
+guidebook-food-processing-type-medical-assembler = assemble
+guidebook-food-processing-type-medical-generic = cook
+# End Frontier: processing types
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl
new file mode 100644
index 00000000000..99a458e07a2
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl
@@ -0,0 +1,4 @@
+# Appraisal cartridge
+appraisal-program-name = Appraisal App Plus
+appraisal-label-name = Item
+appraisal-label-price = Appraised Price
diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
index f67b938ffd5..c41173ce9dc 100644
--- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
@@ -44,6 +44,7 @@ guide-entry-shipyard-gourd = Gourd
 guide-entry-shipyard-hammer = Hammer
 guide-entry-shipyard-hauler = Hauler
 guide-entry-shipyard-harbormaster = Harbormaster
+guide-entry-shipyard-honker = Honker
 guide-entry-shipyard-investigator = Investigator
 guide-entry-shipyard-kestrel = Kestrel
 guide-entry-shipyard-kilderkin = Kilderkin
@@ -55,8 +56,11 @@ guide-entry-shipyard-mccargo = McCargo
 guide-entry-shipyard-mcdelivery = McDelivery
 guide-entry-shipyard-pathfinder = Pathfinder
 guide-entry-shipyard-pioneer = Pioneer
+guide-entry-shipyard-placebo = Placebo
 guide-entry-shipyard-prospector = Prospector
 guide-entry-shipyard-searchlight = Searchlight
+guide-entry-shipyard-sparrow = Sparrow
+guide-entry-shipyard-skipper = Skipper
 guide-entry-shipyard-spirit = Spirit
 guide-entry-shipyard-stasis = Stasis
 guide-entry-shipyard-vagabond = Vagabond
diff --git a/Resources/Locale/en-US/_NF/kitchen/components/microwave-component.ftl b/Resources/Locale/en-US/_NF/kitchen/components/microwave-component.ftl
new file mode 100644
index 00000000000..5ee3961fed7
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/kitchen/components/microwave-component.ftl
@@ -0,0 +1,28 @@
+## Entity
+microwave-component-range-interact-item-too-big = { CAPITALIZE(THE($item)) } is too big to fit in the oven!
+microwave-component-assembler-interact-item-too-big = { CAPITALIZE(THE($item)) } is too big to fit in the Food-O-Mat!
+microwave-component-medical-assembler-interact-item-too-big = { CAPITALIZE(THE($item)) } is too big to fit in the medical assembler!
+
+microwave-component-upgrade-cook-time = cook time
+
+microwave-component-assembler-no-valid-recipe = No valid recipe found!
+
+## Bound UI
+assembler-bound-user-interface-insert-ingredients = INSERT MATERIALS
+assembler-bound-user-interface-cook-time-label = TIME LEFT: {$time}
+
+## UI
+
+microwave-menu-range-title = Electric Range
+
+microwave-menu-range-footer-flavor-left = NT is not liable for damages due to kitchen fires.
+
+assembler-menu-title = Food-O-Mat
+assembler-menu-medical-title = Medical Assembler
+
+assembler-menu-start-button = Assemble
+
+assembler-menu-footer-flavor-left = Remember to store foodstuffs at safe temperatures.
+assembler-menu-medical-footer-flavor-left = Certified 99.99% nano-sterile.
+
+assembler-menu-footer-flavor-right = v0.2.1
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_NF/research/technologies.ftl b/Resources/Locale/en-US/_NF/research/technologies.ftl
index 9384075b9a0..5822f98b35a 100644
--- a/Resources/Locale/en-US/_NF/research/technologies.ftl
+++ b/Resources/Locale/en-US/_NF/research/technologies.ftl
@@ -1,4 +1,5 @@
-research-techology-advanced-personal-propulsion = Advanced Personal Propulsion
+research-technology-advanced-food-service = Advanced Food Service
+research-technology-advanced-personal-propulsion = Advanced Personal Propulsion
 research-technology-rapid-construction = Rapid Construction
 research-technology-hardsuits-basic = Basic Hardsuits
 research-technology-hardsuits-specialized = Specialized Hardsuits
@@ -10,6 +11,6 @@ research-technology-hardsuits-experimental-rd = Experimental Research Hardsuit
 research-technology-construction-bags = Construction Bags
 research-technology-bounty-hunting = Bounty Hunting
 research-technology-arsenal-style = Punk Gear
-research-techology-advanced-topicals = Advanced Topicals
+research-technology-industrial-medicine = Industrial Medicine
 research-technology-magnets-tech-advanced = Advanced Localized Magnetism
 research-technology-magnets-tech-combat = Localized Magnetism Combat Application
\ No newline at end of file
diff --git a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
index 12346ee75dc..0603b3c8463 100644
--- a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
@@ -9,7 +9,6 @@ microwave-component-suicide-multi-head-others-message = {$victim} is trying to c
 microwave-component-suicide-others-message = {$victim} is trying to cook their head!
 microwave-component-suicide-multi-head-message = You cook your heads!
 microwave-component-suicide-message = You cook your head!
-microwave-component-upgrade-cook-time = cook time
 microwave-component-interact-full = It's full.
 microwave-component-interact-item-too-big = { CAPITALIZE(THE($item)) } is too big to fit in the microwave!
 
diff --git a/Resources/Maps/_NF/POI/bahama.yml b/Resources/Maps/_NF/POI/bahama.yml
index 952e142df1e..c374b222b77 100644
--- a/Resources/Maps/_NF/POI/bahama.yml
+++ b/Resources/Maps/_NF/POI/bahama.yml
@@ -15195,24 +15195,27 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 13.5,-2.5
       parent: 2
-- proto: KitchenDeepFryer
+- proto: KitchenAssemblerPOI
+  entities:
+  - uid: 1532
+    components:
+    - type: Transform
+      pos: -7.5,-5.5
+      parent: 2
+- proto: KitchenDeepFryerPOI
   entities:
   - uid: 2157
     components:
     - type: Transform
       pos: -5.5,-3.5
       parent: 2
-    - type: DisableToolUse
-      anchoring: True
-- proto: KitchenElectricGrill
+- proto: KitchenElectricRangePOI
   entities:
-  - uid: 1532
+  - uid: 1533
     components:
     - type: Transform
       pos: -6.5,-3.5
       parent: 2
-    - type: DisableToolUse
-      anchoring: True
 - proto: KitchenKnife
   entities:
   - uid: 2177
@@ -15225,31 +15228,20 @@ entities:
     - type: Transform
       pos: -5.526224,-0.64360356
       parent: 2
-- proto: KitchenMicrowave
+- proto: KitchenMicrowavePOI
   entities:
   - uid: 1519
     components:
     - type: Transform
       pos: -5.5,0.5
       parent: 2
-    - type: DisableToolUse
-      anchoring: True
-  - uid: 1533
-    components:
-    - type: Transform
-      pos: -7.5,-5.5
-      parent: 2
-    - type: DisableToolUse
-      anchoring: True
-- proto: KitchenReagentGrinder
+- proto: KitchenReagentGrinderPOI
   entities:
   - uid: 965
     components:
     - type: Transform
       pos: -5.5,-2.5
       parent: 2
-    - type: DisableToolUse
-      anchoring: True
 - proto: KitchenSpike
   entities:
   - uid: 1468
@@ -17409,8 +17401,6 @@ entities:
     - type: Transform
       pos: 0.5,9.5
       parent: 2
-    - type: DisableToolUse
-      anchoring: True
     - type: ContainerContainer
       containers:
         ShipyardConsole-targetId: !type:ContainerSlot
@@ -19059,11 +19049,6 @@ entities:
     - type: Transform
       pos: -7.5,-6.5
       parent: 2
-  - uid: 2159
-    components:
-    - type: Transform
-      pos: -6.5,-3.5
-      parent: 2
 - proto: TableCounterMetal
   entities:
   - uid: 1473
@@ -19288,8 +19273,6 @@ entities:
     - type: Transform
       pos: -4.5,9.5
       parent: 2
-    - type: DisableToolUse
-      anchoring: True
 - proto: VendingMachineBooze
   entities:
   - uid: 1601
@@ -19354,8 +19337,6 @@ entities:
     - type: Transform
       pos: 7.5,10.5
       parent: 2
-    - type: DisableToolUse
-      anchoring: True
 - proto: VendingMachineDinnerware
   entities:
   - uid: 1525
@@ -19390,8 +19371,6 @@ entities:
     - type: Transform
       pos: -6.5,10.5
       parent: 2
-    - type: DisableToolUse
-      anchoring: True
 - proto: VendingMachineSeedsUnlocked
   entities:
   - uid: 1388
diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml
index 223925595ab..649e5e1f194 100644
--- a/Resources/Maps/_NF/POI/cove.yml
+++ b/Resources/Maps/_NF/POI/cove.yml
@@ -5903,7 +5903,7 @@ entities:
       pos: 7.5,28.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -7268.7188
+      secondsUntilStateChange: -7306.7144
       state: Opening
 - proto: FenceWoodSmallCorner
   entities:
@@ -7825,6 +7825,13 @@ entities:
     - type: Transform
       pos: 9.443164,17.108042
       parent: 1
+- proto: KitchenAssembler
+  entities:
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 1
 - proto: KitchenDeepFryer
   entities:
   - uid: 334
@@ -7833,7 +7840,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,5.5
       parent: 1
-- proto: KitchenElectricGrill
+- proto: SyndicateKitchenElectricRange
   entities:
   - uid: 774
     components:
@@ -9893,12 +9900,6 @@ entities:
     - type: Transform
       pos: -6.5,6.5
       parent: 1
-  - uid: 675
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,7.5
-      parent: 1
   - uid: 683
     components:
     - type: Transform
diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
index 8d3f4672abc..21d21d18e55 100644
--- a/Resources/Maps/_NF/POI/nfsd.yml
+++ b/Resources/Maps/_NF/POI/nfsd.yml
@@ -12975,7 +12975,7 @@ entities:
     - type: Transform
       pos: 17.5,25.5
       parent: 1
-- proto: KitchenMicrowave
+- proto: KitchenMicrowavePOI
   entities:
   - uid: 762
     components:
diff --git a/Resources/Maps/_NF/POI/tinnia.yml b/Resources/Maps/_NF/POI/tinnia.yml
index 50f5b600b71..d9162a666ae 100644
--- a/Resources/Maps/_NF/POI/tinnia.yml
+++ b/Resources/Maps/_NF/POI/tinnia.yml
@@ -867,7 +867,7 @@ entities:
       pos: 14.5,-0.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -2535.3264
+      secondsUntilStateChange: -2634.3037
       state: Opening
   - uid: 196
     components:
@@ -6741,13 +6741,6 @@ entities:
       parent: 1
     - type: DisableToolUse
       anchoring: True
-  - uid: 389
-    components:
-    - type: Transform
-      pos: 4.5,6.5
-      parent: 1
-    - type: DisableToolUse
-      anchoring: True
   - uid: 391
     components:
     - type: Transform
@@ -6762,6 +6755,12 @@ entities:
       parent: 1
     - type: DisableToolUse
       anchoring: True
+  - uid: 2248
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,2.5
+      parent: 1
 - proto: ComputerSolarControl
   entities:
   - uid: 1412
@@ -10545,7 +10544,14 @@ entities:
     - type: Transform
       pos: -8.274868,-9.994838
       parent: 1
-- proto: KitchenDeepFryer
+- proto: KitchenAssemblerPOI
+  entities:
+  - uid: 389
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+- proto: KitchenDeepFryerPOI
   entities:
   - uid: 2172
     components:
@@ -10553,8 +10559,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,5.5
       parent: 1
-    - type: DisableToolUse
-      anchoring: True
+- proto: KitchenElectricRangePOI
+  entities:
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
 - proto: KitchenKnife
   entities:
   - uid: 1811
@@ -10562,38 +10573,25 @@ entities:
     - type: Transform
       pos: 1.4529569,4.6690474
       parent: 1
-- proto: KitchenMicrowave
+- proto: KitchenMicrowavePOI
   entities:
   - uid: 240
     components:
     - type: Transform
       pos: -1.5,4.5
       parent: 1
-    - type: DisableToolUse
-      anchoring: True
-  - uid: 253
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 1
-    - type: DisableToolUse
-      anchoring: True
-- proto: KitchenReagentGrinder
+- proto: KitchenReagentGrinderPOI
   entities:
   - uid: 187
     components:
     - type: Transform
       pos: -2.5,4.5
       parent: 1
-    - type: DisableToolUse
-      anchoring: True
   - uid: 254
     components:
     - type: Transform
       pos: 1.5,5.5
       parent: 1
-    - type: DisableToolUse
-      anchoring: True
 - proto: KitchenSpike
   entities:
   - uid: 206
diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml
index 1d511a61492..18f98ecf171 100644
--- a/Resources/Maps/_NF/POI/trade.yml
+++ b/Resources/Maps/_NF/POI/trade.yml
@@ -22685,14 +22685,28 @@ entities:
       parent: 1
     missingComponents:
     - Anchorable
-- proto: KitchenMicrowave
+- proto: KitchenAssemblerPOI
   entities:
-  - uid: 1363
+  - uid: 869
+    components:
+    - type: Transform
+      pos: 61.5,-18.5
+      parent: 1
+- proto: KitchenElectricRangePOI
+  entities:
+  - uid: 1350
     components:
     - type: Transform
       pos: 62.5,-15.5
       parent: 1
-- proto: KitchenReagentGrinder
+- proto: KitchenMicrowavePOI
+  entities:
+  - uid: 6422
+    components:
+    - type: Transform
+      pos: 62.5,-16.5
+      parent: 1
+- proto: KitchenReagentGrinderPOI
   entities:
   - uid: 1364
     components:
@@ -22836,6 +22850,40 @@ entities:
     - type: Transform
       pos: 53.396393,-14.43357
       parent: 1
+- proto: NFSignBus
+  entities:
+  - uid: 6379
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 1
+  - uid: 6380
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 6377
+    components:
+    - type: Transform
+      pos: -16.5,25.5
+      parent: 1
+  - uid: 6378
+    components:
+    - type: Transform
+      pos: -12.5,25.5
+      parent: 1
+  - uid: 6383
+    components:
+    - type: Transform
+      pos: 77.5,-22.5
+      parent: 1
+  - uid: 6384
+    components:
+    - type: Transform
+      pos: 73.5,-22.5
+      parent: 1
 - proto: PaperBin20
   entities:
   - uid: 6327
@@ -26577,8 +26625,6 @@ entities:
     - type: Transform
       pos: 1.5,-4.5
       parent: 1
-- proto: SignAtmosMinsky
-  entities:
   - uid: 3725
     components:
     - type: Transform
@@ -26972,40 +27018,6 @@ entities:
     - type: Transform
       pos: 50.5,-1.5
       parent: 1
-- proto: NFSignBus
-  entities:
-  - uid: 6379
-    components:
-    - type: Transform
-      pos: -4.5,-15.5
-      parent: 1
-  - uid: 6380
-    components:
-    - type: Transform
-      pos: -1.5,-15.5
-      parent: 1
-- proto: NFSignDock
-  entities:
-  - uid: 6377
-    components:
-    - type: Transform
-      pos: -16.5,25.5
-      parent: 1
-  - uid: 6378
-    components:
-    - type: Transform
-      pos: -12.5,25.5
-      parent: 1
-  - uid: 6383
-    components:
-    - type: Transform
-      pos: 77.5,-22.5
-      parent: 1
-  - uid: 6384
-    components:
-    - type: Transform
-      pos: 73.5,-22.5
-      parent: 1
 - proto: SignShock
   entities:
   - uid: 1459
@@ -27372,11 +27384,6 @@ entities:
       id: Dock South
 - proto: Table
   entities:
-  - uid: 869
-    components:
-    - type: Transform
-      pos: 62.5,-15.5
-      parent: 1
   - uid: 1256
     components:
     - type: Transform
@@ -27389,11 +27396,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 52.5,-1.5
       parent: 1
-  - uid: 1350
-    components:
-    - type: Transform
-      pos: 62.5,-16.5
-      parent: 1
   - uid: 1352
     components:
     - type: Transform
@@ -27424,6 +27426,12 @@ entities:
     - type: Transform
       pos: 62.5,-18.5
       parent: 1
+  - uid: 1363
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-16.5
+      parent: 1
   - uid: 1386
     components:
     - type: Transform
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
index dee3dc64ce1..ec7d61daf66 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml
@@ -39,7 +39,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -266,7 +266,7 @@ entities:
           0,-4:
             0: 65535
           -1,-4:
-            0: 61015
+            0: 60503
           0,-3:
             0: 12287
           -1,-3:
@@ -346,13 +346,6 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-- proto: AirCanister
-  entities:
-  - uid: 187
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 3
 - proto: AirlockCaptainGlassLocked
   entities:
   - uid: 271
@@ -446,7 +439,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-14.5
       parent: 3
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 139
     components:
@@ -471,32 +464,37 @@ entities:
   - uid: 144
     components:
     - type: Transform
-      pos: 4.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-14.5
       parent: 3
   - uid: 145
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,-16.5
       parent: 3
   - uid: 146
     components:
     - type: Transform
-      pos: 9.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-16.5
       parent: 3
   - uid: 147
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-14.5
       parent: 3
   - uid: 148
     components:
     - type: Transform
-      pos: -4.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 3
-  - uid: 242
+  - uid: 559
     components:
     - type: Transform
-      pos: 3.5,-2.5
+      pos: 4.5,-16.5
       parent: 3
 - proto: AtmosFixBlockerMarker
   entities:
@@ -681,46 +679,26 @@ entities:
     - type: Transform
       pos: 2.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 69
     components:
     - type: Transform
       pos: 3.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 70
     components:
     - type: Transform
       pos: 0.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 76
     components:
     - type: Transform
       pos: 1.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 528
     components:
     - type: Transform
       pos: 4.5,-16.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
 - proto: BookHowToSurvive
   entities:
   - uid: 531
@@ -1611,6 +1589,11 @@ entities:
     - type: Transform
       pos: -1.5,-9.5
       parent: 3
+  - uid: 373
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 3
 - proto: ChairFolding
   entities:
   - uid: 214
@@ -1851,16 +1834,28 @@ entities:
     - type: Transform
       pos: 5.286945,-7.6460857
       parent: 3
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        paper_label: !type:ContainerSlot {}
   - uid: 236
     components:
     - type: Transform
       pos: 5.5473614,-7.3856688
       parent: 3
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        paper_label: !type:ContainerSlot {}
   - uid: 239
     components:
     - type: Transform
       pos: 5.7348614,-7.6669188
       parent: 3
+    - type: ItemSlots
+    - type: ContainerContainer
+      containers:
+        paper_label: !type:ContainerSlot {}
 - proto: DrinkRumBottleFull
   entities:
   - uid: 228
@@ -1948,6 +1943,19 @@ entities:
     - type: Transform
       pos: 5.5,-13.5
       parent: 3
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 226
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-10.5
+      parent: 3
+    - type: GasMixer
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 448
@@ -1957,16 +1965,24 @@ entities:
       pos: 2.5,-17.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPipeBend
   entities:
-  - uid: 373
+  - uid: 187
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 242
     components:
     - type: Transform
       pos: -0.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 375
     components:
     - type: Transform
@@ -1974,14 +1990,14 @@ entities:
       pos: -1.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 419
     components:
     - type: Transform
       pos: 2.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 443
     components:
     - type: Transform
@@ -1989,7 +2005,7 @@ entities:
       pos: 0.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPipeFourway
   entities:
   - uid: 383
@@ -1998,7 +2014,7 @@ entities:
       pos: 1.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
 - proto: GasPipeStraight
   entities:
   - uid: 374
@@ -2008,15 +2024,7 @@ entities:
       pos: -1.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
-  - uid: 377
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-10.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 378
     components:
     - type: Transform
@@ -2024,7 +2032,7 @@ entities:
       pos: -1.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 379
     components:
     - type: Transform
@@ -2032,7 +2040,7 @@ entities:
       pos: -1.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 380
     components:
     - type: Transform
@@ -2040,7 +2048,7 @@ entities:
       pos: -1.5,-14.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 381
     components:
     - type: Transform
@@ -2048,7 +2056,7 @@ entities:
       pos: -1.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 382
     components:
     - type: Transform
@@ -2056,7 +2064,7 @@ entities:
       pos: 0.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 384
     components:
     - type: Transform
@@ -2064,7 +2072,7 @@ entities:
       pos: 2.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 385
     components:
     - type: Transform
@@ -2072,7 +2080,7 @@ entities:
       pos: 3.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 386
     components:
     - type: Transform
@@ -2080,7 +2088,7 @@ entities:
       pos: 4.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 387
     components:
     - type: Transform
@@ -2088,7 +2096,7 @@ entities:
       pos: 5.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 389
     components:
     - type: Transform
@@ -2096,7 +2104,7 @@ entities:
       pos: 1.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 390
     components:
     - type: Transform
@@ -2104,7 +2112,7 @@ entities:
       pos: 1.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 391
     components:
     - type: Transform
@@ -2112,7 +2120,7 @@ entities:
       pos: 1.5,-8.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 392
     components:
     - type: Transform
@@ -2120,7 +2128,7 @@ entities:
       pos: 1.5,-7.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 394
     components:
     - type: Transform
@@ -2128,7 +2136,7 @@ entities:
       pos: 1.5,-5.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 395
     components:
     - type: Transform
@@ -2136,7 +2144,7 @@ entities:
       pos: 1.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 396
     components:
     - type: Transform
@@ -2144,7 +2152,7 @@ entities:
       pos: 1.5,-3.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 397
     components:
     - type: Transform
@@ -2152,7 +2160,7 @@ entities:
       pos: 1.5,-2.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 398
     components:
     - type: Transform
@@ -2160,15 +2168,7 @@ entities:
       pos: 1.5,-1.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
-  - uid: 399
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-0.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 400
     components:
     - type: Transform
@@ -2176,84 +2176,84 @@ entities:
       pos: 2.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 405
     components:
     - type: Transform
       pos: 6.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 406
     components:
     - type: Transform
       pos: 6.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 407
     components:
     - type: Transform
       pos: 6.5,-14.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 408
     components:
     - type: Transform
       pos: 6.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 414
     components:
     - type: Transform
       pos: 2.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 416
     components:
     - type: Transform
       pos: 2.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 417
     components:
     - type: Transform
       pos: 2.5,-8.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 420
     components:
     - type: Transform
       pos: 2.5,-5.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 421
     components:
     - type: Transform
       pos: 2.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 423
     components:
     - type: Transform
       pos: 2.5,-14.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 425
     components:
     - type: Transform
       pos: 2.5,-16.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 426
     components:
     - type: Transform
@@ -2261,7 +2261,7 @@ entities:
       pos: 1.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 427
     components:
     - type: Transform
@@ -2269,7 +2269,7 @@ entities:
       pos: 0.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 428
     components:
     - type: Transform
@@ -2277,7 +2277,7 @@ entities:
       pos: -0.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 429
     components:
     - type: Transform
@@ -2285,7 +2285,7 @@ entities:
       pos: -1.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 430
     components:
     - type: Transform
@@ -2293,7 +2293,7 @@ entities:
       pos: -2.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 431
     components:
     - type: Transform
@@ -2301,7 +2301,7 @@ entities:
       pos: 3.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 432
     components:
     - type: Transform
@@ -2309,7 +2309,7 @@ entities:
       pos: 4.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 433
     components:
     - type: Transform
@@ -2317,7 +2317,7 @@ entities:
       pos: 5.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 434
     components:
     - type: Transform
@@ -2325,7 +2325,7 @@ entities:
       pos: 6.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 435
     components:
     - type: Transform
@@ -2333,7 +2333,7 @@ entities:
       pos: 3.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 436
     components:
     - type: Transform
@@ -2341,7 +2341,7 @@ entities:
       pos: 4.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 437
     components:
     - type: Transform
@@ -2349,7 +2349,7 @@ entities:
       pos: 5.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 438
     components:
     - type: Transform
@@ -2357,7 +2357,7 @@ entities:
       pos: 6.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 444
     components:
     - type: Transform
@@ -2365,7 +2365,7 @@ entities:
       pos: 0.5,-1.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 445
     components:
     - type: Transform
@@ -2373,7 +2373,7 @@ entities:
       pos: 0.5,-2.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 446
     components:
     - type: Transform
@@ -2381,7 +2381,7 @@ entities:
       pos: 0.5,-3.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 447
     components:
     - type: Transform
@@ -2389,7 +2389,7 @@ entities:
       pos: 1.5,-4.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 376
@@ -2399,14 +2399,14 @@ entities:
       pos: -0.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 388
     components:
     - type: Transform
       pos: 6.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 393
     components:
     - type: Transform
@@ -2414,7 +2414,7 @@ entities:
       pos: 1.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 411
     components:
     - type: Transform
@@ -2422,7 +2422,7 @@ entities:
       pos: 2.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 413
     components:
     - type: Transform
@@ -2430,7 +2430,7 @@ entities:
       pos: 2.5,-7.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 415
     components:
     - type: Transform
@@ -2438,7 +2438,7 @@ entities:
       pos: 2.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 422
     components:
     - type: Transform
@@ -2446,7 +2446,7 @@ entities:
       pos: 2.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 424
     components:
     - type: Transform
@@ -2454,9 +2454,16 @@ entities:
       pos: 2.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GasPort
   entities:
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 372
     components:
     - type: Transform
@@ -2464,7 +2471,7 @@ entities:
       pos: -2.5,-9.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
 - proto: GasVentPump
   entities:
   - uid: 401
@@ -2474,14 +2481,14 @@ entities:
       pos: 3.5,-6.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 402
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 403
     components:
     - type: Transform
@@ -2489,7 +2496,7 @@ entities:
       pos: -1.5,-16.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 404
     components:
     - type: Transform
@@ -2497,7 +2504,7 @@ entities:
       pos: 7.5,-11.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 409
     components:
     - type: Transform
@@ -2505,7 +2512,7 @@ entities:
       pos: 6.5,-16.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
   - uid: 410
     components:
     - type: Transform
@@ -2513,7 +2520,7 @@ entities:
       pos: 1.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#0000BBFF'
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 412
@@ -2523,7 +2530,7 @@ entities:
       pos: 3.5,-12.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 418
     components:
     - type: Transform
@@ -2531,7 +2538,7 @@ entities:
       pos: 3.5,-7.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 439
     components:
     - type: Transform
@@ -2539,14 +2546,14 @@ entities:
       pos: 7.5,-10.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 440
     components:
     - type: Transform
       pos: 0.5,-0.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 441
     components:
     - type: Transform
@@ -2554,7 +2561,7 @@ entities:
       pos: 7.5,-13.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
   - uid: 442
     components:
     - type: Transform
@@ -2562,7 +2569,7 @@ entities:
       pos: -3.5,-15.5
       parent: 3
     - type: AtmosPipeColor
-      color: '#BB0000FF'
+      color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
   - uid: 120
@@ -2578,16 +2585,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 9.5,-10.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 77
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-10.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: HarmonicaInstrument
   entities:
   - uid: 453
@@ -2595,12 +2598,12 @@ entities:
     - type: Transform
       pos: 6.464443,-9.590082
       parent: 3
-- proto: SyndicateMicrowave
+- proto: LockerWallMaterialsFuelPlasmaFilled2
   entities:
-  - uid: 109
+  - uid: 377
     components:
     - type: Transform
-      pos: 6.5,-6.5
+      pos: -2.5,-8.5
       parent: 3
 - proto: LockerWallMedicalFilled
   entities:
@@ -2698,6 +2701,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 3
+- proto: NitrogenCanister
+  entities:
+  - uid: 98
+    components:
+    - type: Transform
+      anchored: True
+      pos: -2.5,-9.5
+      parent: 3
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 251
+    components:
+    - type: Transform
+      anchored: True
+      pos: 0.5,-9.5
+      parent: 3
+    - type: Physics
+      bodyType: Static
 - proto: Paper
   entities:
   - uid: 449
@@ -2877,11 +2900,6 @@ entities:
     - type: Transform
       pos: 2.5,-12.5
       parent: 3
-  - uid: 251
-    components:
-    - type: Transform
-      pos: 0.5,-9.5
-      parent: 3
   - uid: 557
     components:
     - type: Transform
@@ -2942,13 +2960,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-4.5
       parent: 3
-- proto: SheetPlasma
-  entities:
-  - uid: 98
-    components:
-    - type: Transform
-      pos: 0.5504579,-9.491902
-      parent: 3
 - proto: ShuttersNormalOpen
   entities:
   - uid: 72
@@ -2956,110 +2967,66 @@ entities:
     - type: Transform
       pos: 0.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 73
     components:
     - type: Transform
       pos: 1.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 136
     components:
     - type: Transform
       pos: 2.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 137
     components:
     - type: Transform
       pos: 3.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 138
     components:
     - type: Transform
       pos: 4.5,-14.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 153
-      - 152
   - uid: 243
     components:
     - type: Transform
       pos: -0.5,1.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 244
     components:
     - type: Transform
       pos: -0.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 245
     components:
     - type: Transform
       pos: -0.5,-2.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 246
     components:
     - type: Transform
       pos: 0.5,2.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 247
     components:
     - type: Transform
       pos: 1.5,2.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 248
     components:
     - type: Transform
       pos: 2.5,1.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 249
     components:
     - type: Transform
       pos: 2.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
   - uid: 250
     components:
     - type: Transform
       pos: 4.5,-3.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 177
 - proto: ShuttleGunPirateCannon
   entities:
   - uid: 191
@@ -3068,20 +3035,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 155
-      - 472
   - uid: 192
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,0.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 155
-      - 472
 - proto: SignalButtonDirectional
   entities:
   - uid: 152
@@ -3250,6 +3209,13 @@ entities:
     - type: Transform
       pos: -0.5,-6.5
       parent: 3
+- proto: SyndicateMicrowave
+  entities:
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 3
 - proto: TableCarpet
   entities:
   - uid: 89
@@ -3340,117 +3306,87 @@ entities:
     - type: Transform
       pos: 6.5,-3.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 37
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-12.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 38
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 39
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 40
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 7.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 41
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-11.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 42
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 46
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-12.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 58
     components:
     - type: Transform
       pos: -2.5,-5.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 59
     components:
     - type: Transform
       pos: 7.5,-4.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 82
     components:
     - type: Transform
       pos: -1.5,-3.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 99
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-11.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 112
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 8.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 118
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 119
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-18.5
       parent: 3
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: ToolboxElectrical
   entities:
   - uid: 481
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
index 4aa4412037c..83f7e001450 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
@@ -566,77 +566,89 @@ entities:
     - type: Transform
       pos: 1.5,-5.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 7
     components:
     - type: Transform
-      pos: 4.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,2.5
       parent: 1
   - uid: 8
     components:
     - type: Transform
-      pos: 4.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,3.5
       parent: 1
   - uid: 9
     components:
     - type: Transform
-      pos: 4.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,4.5
       parent: 1
   - uid: 10
     components:
     - type: Transform
-      pos: -3.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,4.5
       parent: 1
   - uid: 11
     components:
     - type: Transform
-      pos: -3.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,3.5
       parent: 1
   - uid: 12
     components:
     - type: Transform
-      pos: -3.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,2.5
       parent: 1
   - uid: 13
     components:
     - type: Transform
-      pos: 4.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-4.5
       parent: 1
   - uid: 14
     components:
     - type: Transform
-      pos: 4.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-3.5
       parent: 1
   - uid: 15
     components:
     - type: Transform
-      pos: 4.5,-4.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-2.5
       parent: 1
   - uid: 16
     components:
     - type: Transform
-      pos: -3.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-2.5
       parent: 1
   - uid: 17
     components:
     - type: Transform
-      pos: -3.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
       parent: 1
   - uid: 18
     components:
     - type: Transform
-      pos: -3.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-4.5
       parent: 1
   - uid: 19
     components:
     - type: Transform
-      pos: -0.5,-9.5
+      pos: 1.5,-9.5
       parent: 1
   - uid: 20
     components:
     - type: Transform
-      pos: 1.5,-9.5
+      pos: -0.5,-9.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
@@ -1868,29 +1880,11 @@ entities:
         - 0
 - proto: ClosetWallMaintenanceFilledRandom
   entities:
-  - uid: 209
+  - uid: 276
     components:
     - type: Transform
-      pos: -0.5,6.5
+      pos: 0.5,6.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: ClothingEyesEyepatch
   entities:
   - uid: 211
@@ -2240,6 +2234,47 @@ entities:
     - type: Transform
       pos: -2.7120032,-0.473266
       parent: 1
+- proto: LockerWallMaterialsFuelUraniumFilled
+  entities:
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -2.5,9.5
+      parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 1
+- proto: NFSignShield
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 1
+  - uid: 360
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 1
+  - uid: 362
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 207
@@ -2263,10 +2298,10 @@ entities:
       parent: 1
 - proto: PaintingSkeletonCigarette
   entities:
-  - uid: 276
+  - uid: 209
     components:
     - type: Transform
-      pos: 0.5,6.5
+      pos: -0.5,6.5
       parent: 1
 - proto: PaperCaptainsThoughts
   entities:
@@ -2669,13 +2704,6 @@ entities:
       linkedPorts:
         503:
         - Pressed: Trigger
-- proto: SheetUranium
-  entities:
-  - uid: 208
-    components:
-    - type: Transform
-      pos: -0.65123916,8.543868
-      parent: 1
 - proto: ShuttersNormal
   entities:
   - uid: 341
@@ -2683,97 +2711,61 @@ entities:
     - type: Transform
       pos: 4.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 356
   - uid: 342
     components:
     - type: Transform
       pos: 4.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 356
   - uid: 343
     components:
     - type: Transform
       pos: 4.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 356
   - uid: 344
     components:
     - type: Transform
       pos: -3.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 355
   - uid: 345
     components:
     - type: Transform
       pos: -3.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 355
   - uid: 346
     components:
     - type: Transform
       pos: -3.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 355
   - uid: 347
     components:
     - type: Transform
       pos: 4.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 353
   - uid: 348
     components:
     - type: Transform
       pos: 4.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 353
   - uid: 349
     components:
     - type: Transform
       pos: 4.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 353
   - uid: 350
     components:
     - type: Transform
       pos: -3.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 354
   - uid: 351
     components:
     - type: Transform
       pos: -3.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 354
   - uid: 352
     components:
     - type: Transform
       pos: -3.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 354
 - proto: ShuttersRadiation
   entities:
   - uid: 206
@@ -2782,35 +2774,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,8.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 274
   - uid: 224
     components:
     - type: Transform
       pos: -1.5,9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 274
   - uid: 225
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 274
   - uid: 228
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,6.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 274
 - proto: ShuttleGunPirateCannon
   entities:
   - uid: 501
@@ -2819,36 +2799,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 506
   - uid: 502
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 507
   - uid: 503
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 508
   - uid: 504
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 505
 - proto: SignalButtonDirectional
   entities:
   - uid: 274
@@ -2933,40 +2901,6 @@ entities:
     - type: Transform
       pos: -0.5,9.5
       parent: 1
-- proto: NFSignShield
-  entities:
-  - uid: 359
-    components:
-    - type: Transform
-      pos: 5.5,5.5
-      parent: 1
-  - uid: 360
-    components:
-    - type: Transform
-      pos: -4.5,5.5
-      parent: 1
-  - uid: 361
-    components:
-    - type: Transform
-      pos: -4.5,-5.5
-      parent: 1
-  - uid: 362
-    components:
-    - type: Transform
-      pos: 5.5,-5.5
-      parent: 1
-- proto: NFSignDock
-  entities:
-  - uid: 363
-    components:
-    - type: Transform
-      pos: 2.5,-9.5
-      parent: 1
-  - uid: 364
-    components:
-    - type: Transform
-      pos: -1.5,-9.5
-      parent: 1
 - proto: SMESBasic
   entities:
   - uid: 365
diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
index 34592b38649..fb22e288160 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
@@ -1632,43 +1632,53 @@ entities:
     - type: Transform
       pos: 9.5,-21.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 57
     components:
     - type: Transform
-      pos: 20.5,-9.5
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-11.5
       parent: 1
   - uid: 58
     components:
     - type: Transform
-      pos: -21.5,-11.5
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-9.5
       parent: 1
   - uid: 59
     components:
     - type: Transform
-      pos: -1.5,-32.5
+      pos: 0.5,-32.5
       parent: 1
   - uid: 60
     components:
     - type: Transform
-      pos: -21.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-11.5
       parent: 1
   - uid: 61
     components:
     - type: Transform
-      pos: 0.5,-32.5
+      pos: -1.5,-32.5
       parent: 1
   - uid: 62
     components:
     - type: Transform
-      pos: 20.5,-11.5
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-9.5
       parent: 1
   - uid: 638
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: -14.5,-21.5
       parent: 1
+  - uid: 1261
+    components:
+    - type: Transform
+      pos: -17.5,-22.5
+      parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
   - uid: 175
@@ -9246,6 +9256,33 @@ entities:
     - type: Transform
       pos: -3.5,-25.5
       parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 74
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-10.5
+      parent: 1
+  - uid: 554
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -21.5,-10.5
+      parent: 1
+  - uid: 770
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-32.5
+      parent: 1
+- proto: NFSignShield
+  entities:
+  - uid: 1904
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 487
@@ -9435,8 +9472,8 @@ entities:
   - uid: 23
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-14.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-14.5
       parent: 1
   - uid: 285
     components:
@@ -10398,17 +10435,15 @@ entities:
       parent: 1
 - proto: SignAtmos
   entities:
-  - uid: 1195
+  - uid: 555
     components:
     - type: Transform
-      pos: 4.5,-21.5
+      pos: 7.5,-21.5
       parent: 1
-- proto: SignAtmosMinsky
-  entities:
-  - uid: 555
+  - uid: 1195
     components:
     - type: Transform
-      pos: 7.5,-21.5
+      pos: 4.5,-21.5
       parent: 1
 - proto: SignBar
   entities:
@@ -10574,33 +10609,6 @@ entities:
     - type: Transform
       pos: 2.5,-11.5
       parent: 1
-- proto: NFSignShield
-  entities:
-  - uid: 1261
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 1
-- proto: NFSignDock
-  entities:
-  - uid: 74
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,-10.5
-      parent: 1
-  - uid: 554
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,-10.5
-      parent: 1
-  - uid: 770
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-32.5
-      parent: 1
 - proto: SignSurgery
   entities:
   - uid: 3
diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml
index 28b3b9d3b19..d067a0318b2 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml
@@ -874,6 +874,70 @@ entities:
     - type: RadiationGridResistance
     - type: BecomesStation
       id: Sprinter
+- proto: AirAlarm
+  entities:
+  - uid: 602
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-5.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 89
+      - 289
+      - 299
+      - 334
+      - 431
+      - 439
+      - 285
+      - 292
+      - 138
+      - 57
+      - 361
+      - 151
+      - 286
+      - 385
+      - 332
+      - 92
+      - 335
+      - 490
+      - 481
+      - 69
+      - 492
+      - 491
+      - 489
+      - 423
+      - 421
+      - 422
+      - 420
+      - 419
+  - uid: 603
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 94
+      - 440
+      - 123
+      - 37
+      - 120
+      - 118
+      - 291
+      - 386
+      - 600
+      - 601
+      - 489
+      - 491
+      - 427
+      - 426
+      - 424
+      - 23
+      - 495
+      - 494
 - proto: AirlockCargoGlass
   entities:
   - uid: 3
@@ -983,7 +1047,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -12.5,-5.5
       parent: 1
-- proto: AirlockMaintGlass
+- proto: AirlockMedicalGlass
   entities:
   - uid: 22
     components:
@@ -2452,12 +2516,18 @@ entities:
     - type: Transform
       pos: 0.5,2.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
   - uid: 495
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,5.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
 - proto: FirelockEdge
   entities:
   - uid: 419
@@ -2466,29 +2536,44 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-4.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
   - uid: 420
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-3.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
   - uid: 421
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,-4.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
   - uid: 422
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,-3.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
   - uid: 423
     components:
     - type: Transform
       pos: -3.5,-1.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
 - proto: FirelockGlass
   entities:
   - uid: 69
@@ -2497,57 +2582,89 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-5.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
   - uid: 424
     components:
     - type: Transform
       pos: 1.5,0.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
   - uid: 426
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
   - uid: 427
     components:
     - type: Transform
       pos: 1.5,-1.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
   - uid: 481
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,-5.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
   - uid: 489
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,-2.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
+      - 603
   - uid: 490
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,-2.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
   - uid: 491
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-2.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
+      - 603
   - uid: 492
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-5.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
   - uid: 494
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,8.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
 - proto: FloorDrain
   entities:
   - uid: 401
@@ -2613,6 +2730,20 @@ entities:
       color: '#0055CCFF'
 - proto: GasPipeFourway
   entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 268
     components:
     - type: Transform
@@ -2707,6 +2838,13 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 137
     components:
     - type: Transform
@@ -3117,6 +3255,20 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 415
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 432
     components:
     - type: Transform
@@ -3236,20 +3388,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 122
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 135
-    components:
-    - type: Transform
-      pos: 3.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 136
     components:
     - type: Transform
@@ -3371,6 +3509,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,3.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 57
@@ -3379,6 +3520,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-9.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 94
@@ -3386,6 +3530,9 @@ entities:
     - type: Transform
       pos: -0.5,9.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 120
@@ -3394,6 +3541,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,6.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 286
@@ -3402,6 +3552,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-6.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 289
@@ -3410,6 +3563,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-4.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 292
@@ -3417,6 +3573,9 @@ entities:
     - type: Transform
       pos: 1.5,-3.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 332
@@ -3425,6 +3584,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,-5.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 334
@@ -3433,6 +3595,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,-5.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 335
@@ -3441,6 +3606,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-4.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 386
@@ -3449,6 +3617,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-0.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 431
@@ -3456,6 +3627,19 @@ entities:
     - type: Transform
       pos: -4.5,-1.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -3466,6 +3650,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-3.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 92
@@ -3474,6 +3661,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-3.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 118
@@ -3482,6 +3672,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,4.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 123
@@ -3490,6 +3683,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,7.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 138
@@ -3498,6 +3694,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-8.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 151
@@ -3506,6 +3705,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-6.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 285
@@ -3514,6 +3716,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-4.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 291
@@ -3522,6 +3727,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,0.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 299
@@ -3529,6 +3737,9 @@ entities:
     - type: Transform
       pos: -7.5,-2.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 361
@@ -3537,6 +3748,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-10.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 385
@@ -3544,6 +3758,9 @@ entities:
     - type: Transform
       pos: 7.5,-2.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 439
@@ -3551,6 +3768,9 @@ entities:
     - type: Transform
       pos: -3.5,-1.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 602
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 440
@@ -3558,6 +3778,19 @@ entities:
     - type: Transform
       pos: 0.5,9.5
       parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 600
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 603
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -3864,7 +4097,7 @@ entities:
     - type: Transform
       pos: 1.5,10.5
       parent: 1
-- proto: PoweredlightSodium
+- proto: Poweredlight
   entities:
   - uid: 73
     components:
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml b/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml
index 90d5ab3f1fa..4354ef2baed 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml
@@ -875,69 +875,81 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,3.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 59
     components:
     - type: Transform
-      pos: -15.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-5.5
       parent: 1
   - uid: 60
     components:
     - type: Transform
-      pos: -0.5,-12.5
+      pos: 1.5,-12.5
       parent: 1
   - uid: 61
     components:
     - type: Transform
-      pos: 1.5,-12.5
+      pos: -0.5,-12.5
       parent: 1
   - uid: 62
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-10.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-15.5
       parent: 1
   - uid: 63
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-10.5
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-13.5
       parent: 1
   - uid: 64
     components:
     - type: Transform
-      pos: -11.5,-16.5
+      pos: 12.5,-16.5
       parent: 1
   - uid: 65
     components:
     - type: Transform
-      pos: 12.5,-16.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-10.5
       parent: 1
   - uid: 66
     components:
     - type: Transform
-      pos: -9.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-13.5
       parent: 1
   - uid: 67
     components:
     - type: Transform
-      pos: 10.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-15.5
       parent: 1
   - uid: 68
     components:
     - type: Transform
-      pos: 16.5,-15.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-10.5
       parent: 1
   - uid: 69
     components:
     - type: Transform
-      pos: 16.5,-13.5
+      pos: -11.5,-16.5
       parent: 1
   - uid: 70
     components:
     - type: Transform
-      pos: -15.5,-13.5
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-5.5
+      parent: 1
+  - uid: 1016
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,11.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
@@ -2758,89 +2770,59 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,22.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1453
   - uid: 430
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,22.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1453
   - uid: 431
     components:
     - type: Transform
       pos: -6.5,11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1452
   - uid: 432
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,23.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1453
   - uid: 433
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,23.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1453
   - uid: 434
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,23.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1453
   - uid: 435
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,23.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1453
   - uid: 436
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,23.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1453
   - uid: 437
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,22.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1453
   - uid: 438
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,22.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1453
 - proto: BlastDoorOpen
   entities:
   - uid: 439
@@ -2848,60 +2830,39 @@ entities:
     - type: Transform
       pos: -13.5,-13.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1449
   - uid: 440
     components:
     - type: Transform
       pos: -13.5,-15.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1449
   - uid: 441
     components:
     - type: Transform
       pos: 14.5,-15.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1450
   - uid: 442
     components:
     - type: Transform
       pos: 14.5,-13.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1450
   - uid: 443
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,-11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1451
   - uid: 444
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,-11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1451
   - uid: 445
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1451
 - proto: BrigTimer
   entities:
   - uid: 446
@@ -5495,6 +5456,13 @@ entities:
     - type: Transform
       pos: 1.5,14.5
       parent: 1
+- proto: GasAnalyzer
+  entities:
+  - uid: 1033
+    components:
+    - type: Transform
+      pos: -6.641932,6.5611343
+      parent: 1
 - proto: GasDualPortVentPump
   entities:
   - uid: 961
@@ -7425,43 +7393,31 @@ entities:
     - type: Transform
       pos: 12.5,-6.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1222
     components:
     - type: Transform
       pos: 11.5,-6.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1223
     components:
     - type: Transform
       pos: 13.5,-6.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1224
     components:
     - type: Transform
       pos: -12.5,-6.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1225
     components:
     - type: Transform
       pos: -10.5,-6.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1226
     components:
     - type: Transform
       pos: -11.5,-6.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: HighSecArmoryLocked
   entities:
   - uid: 1227
@@ -7474,6 +7430,13 @@ entities:
     - type: Transform
       pos: -0.5,4.5
       parent: 1
+- proto: HolofanProjector
+  entities:
+  - uid: 1027
+    components:
+    - type: Transform
+      pos: -6.329432,6.310961
+      parent: 1
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 1229
@@ -8205,6 +8168,11 @@ entities:
       parent: 1
 - proto: Rack
   entities:
+  - uid: 1018
+    components:
+    - type: Transform
+      pos: -6.5,6.5
+      parent: 1
   - uid: 1339
     components:
     - type: Transform
@@ -8830,113 +8798,71 @@ entities:
     - type: Transform
       pos: -9.5,-13.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1447
   - uid: 1430
     components:
     - type: Transform
       pos: 7.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1446
   - uid: 1431
     components:
     - type: Transform
       pos: 6.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1446
   - uid: 1432
     components:
     - type: Transform
       pos: 5.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1446
   - uid: 1433
     components:
     - type: Transform
       pos: 4.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1446
   - uid: 1434
     components:
     - type: Transform
       pos: -3.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1446
   - uid: 1435
     components:
     - type: Transform
       pos: -4.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1446
   - uid: 1436
     components:
     - type: Transform
       pos: -5.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1446
   - uid: 1437
     components:
     - type: Transform
       pos: -6.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1446
   - uid: 1438
     components:
     - type: Transform
       pos: -9.5,-14.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1447
   - uid: 1439
     components:
     - type: Transform
       pos: -9.5,-15.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1447
   - uid: 1440
     components:
     - type: Transform
       pos: 10.5,-15.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1448
   - uid: 1441
     components:
     - type: Transform
       pos: 10.5,-14.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1448
   - uid: 1442
     components:
     - type: Transform
       pos: 10.5,-13.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1448
 - proto: ShuttersNormalOpen
   entities:
   - uid: 1443
@@ -8945,18 +8871,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1445
   - uid: 1444
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1445
 - proto: SignalButton
   entities:
   - uid: 1445
@@ -9125,7 +9045,7 @@ entities:
     - type: Transform
       pos: -0.5,-0.5
       parent: 1
-- proto: SignSecurity
+- proto: SignNfsd
   entities:
   - uid: 1459
     components:
@@ -9512,218 +9432,162 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,-3.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 969
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 13.5,-3.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 970
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,-3.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 971
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,-3.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 976
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,-3.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 993
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 11.5,-3.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1517
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,-11.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1522
     components:
     - type: Transform
       pos: -11.5,-1.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1523
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,0.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1524
     components:
     - type: Transform
       pos: -12.5,-1.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1525
     components:
     - type: Transform
       pos: -10.5,-1.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1530
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,0.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1531
     components:
     - type: Transform
       pos: 11.5,-1.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1532
     components:
     - type: Transform
       pos: 12.5,-1.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1533
     components:
     - type: Transform
       pos: 13.5,-1.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1538
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,0.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1539
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -10.5,0.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1540
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 11.5,0.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1541
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 13.5,0.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1542
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,-9.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1543
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,-8.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1544
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,-9.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1545
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,-11.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1546
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,-7.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1547
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,-10.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1548
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,-8.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1549
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 13.5,-7.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 1550
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,-10.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: ToiletEmpty
   entities:
   - uid: 1551
@@ -11496,18 +11360,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 446
   - uid: 1872
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 447
 - proto: WindowFrostedDirectional
   entities:
   - uid: 1873
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml
index 32540168203..dc300ce6665 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml
@@ -605,185 +605,178 @@ entities:
       data:
         tiles:
           0,0:
-            0: 65497
-            1: 38
-          0,1:
-            0: 65531
-            1: 4
+            0: 54135
           0,-1:
-            0: 65535
+            0: 30583
+          -1,0:
+            0: 30924
+            1: 17
+          0,1:
+            0: 65533
+          -1,1:
+            0: 65527
           0,2:
-            0: 65535
+            0: 57343
+          -1,2:
+            0: 30584
           0,3:
-            0: 65535
+            0: 30705
+            1: 32768
+          -1,3:
+            0: 52448
+            1: 8448
+          0,4:
+            0: 3
+            1: 124
           1,0:
-            0: 63287
-            2: 192
+            1: 34547
+            0: 4096
           1,1:
-            1: 129
-            0: 65406
+            0: 57333
           1,2:
-            0: 30711
-            1: 8
+            0: 13115
+          1,3:
+            1: 292
+          1,-1:
+            1: 59392
+            0: 383
+          2,0:
+            1: 4112
+            0: 17508
           2,1:
-            0: 65535
+            0: 64980
           2,2:
-            1: 1
-            0: 254
+            0: 77
+          2,-1:
+            0: 17479
+            1: 256
+          3,0:
+            1: 51
+            0: 4352
+          3,1:
+            0: 12593
+          3,2:
+            0: 17
+          3,-1:
+            1: 12561
           0,-4:
-            0: 65407
-            1: 128
-          0,-3:
+            0: 62138
+          0,-5:
             0: 65535
+          -1,-4:
+            0: 59579
+          0,-3:
+            0: 48638
+          -1,-3:
+            0: 46830
           0,-2:
-            0: 65535
+            0: 1911
+          -1,-2:
+            0: 7388
+          -1,-1:
+            0: 52701
           1,-4:
-            0: 16383
+            0: 8211
+            1: 72
           1,-3:
-            0: 65331
+            0: 61474
           1,-2:
-            0: 65535
-          1,-1:
-            0: 65535
-          2,-4:
-            0: 273
+            0: 65534
+          1,-5:
+            0: 30591
           2,-3:
-            0: 65280
+            0: 4096
+            1: 16896
           2,-2:
-            0: 64511
-            1: 1024
-          2,-1:
-            1: 1
-            0: 61438
+            0: 30579
+            1: 8
+          3,-2:
+            1: 4368
+          0,-8:
+            1: 63249
+          -1,-8:
+            1: 60416
           0,-7:
-            0: 65529
-          0,-6:
-            0: 53183
-            1: 12352
-          0,-5:
+            1: 9
+            0: 60928
+          -1,-7:
+            0: 60928
             1: 3
-            0: 65532
+          0,-6:
+            0: 63726
+          -1,-6:
+            0: 62190
+          -1,-5:
+            0: 65535
           1,-7:
-            0: 65527
+            1: 7
+            0: 60928
           1,-6:
-            0: 65471
-            1: 64
-          1,-5:
-            0: 64511
-            1: 1024
+            0: 63726
           2,-7:
-            0: 13072
+            1: 8720
           2,-6:
-            0: 13107
+            0: 4096
+            1: 546
           2,-5:
-            0: 4915
-          -3,-3:
-            0: 60928
-          -3,-2:
-            0: 65534
+            0: 17
+            1: 4608
+          -4,-1:
+            1: 32768
+          -4,0:
+            1: 136
           -3,-1:
-            0: 65535
-          -2,-4:
-            0: 36863
+            1: 4369
+            0: 17484
+          -3,-2:
+            1: 4370
+            0: 52424
+          -3,0:
+            1: 17
+            0: 21956
+          -3,-3:
+            1: 18432
           -2,-3:
-            0: 65416
+            0: 61576
           -2,-2:
-            0: 65471
-            3: 64
+            0: 53759
           -2,-1:
-            0: 61439
-          -1,-4:
-            0: 65535
-          -1,-3:
-            0: 65535
-          -1,-2:
-            0: 65535
-          -1,-1:
-            0: 65215
-            1: 320
+            0: 207
+            1: 58112
+          -2,-4:
+            1: 66
+            0: 32776
+          -2,-5:
+            0: 52479
+            1: 4096
+          -2,0:
+            1: 15608
+          -4,1:
+            0: 32896
           -3,1:
-            0: 65535
+            0: 63349
           -3,2:
-            0: 255
+            0: 87
           -2,1:
-            0: 65503
-            1: 32
+            0: 65524
           -2,2:
-            1: 3
-            0: 52348
-            3: 128
-          -2,0:
-            0: 64652
-            2: 112
-          -1,0:
-            0: 65531
-            1: 4
-          -1,1:
-            1: 5
-            0: 65530
-          -1,2:
-            0: 57295
-            1: 48
-            3: 8192
-          -1,3:
-            0: 61439
-          -2,-7:
-            0: 65532
-          -2,-6:
-            0: 65471
-            1: 64
-          -2,-5:
-            0: 65535
-          -1,-7:
-            0: 65523
-          -1,-6:
-            0: 32703
-            1: 64
-            3: 32768
-          -1,-5:
-            0: 65527
-            1: 8
-          1,3:
-            0: 311
-          2,0:
-            0: 65262
-            2: 16
-          3,0:
-            0: 13107
-          3,1:
-            0: 13107
-          3,2:
-            0: 51
-          3,-2:
-            0: 4368
-          3,-1:
-            0: 12561
-          0,-8:
-            0: 63249
-          -4,-1:
-            0: 32768
-          -4,0:
-            0: 34952
-          -4,1:
-            0: 34952
-          -4,2:
-            0: 136
-          -3,0:
-            0: 65535
+            0: 34951
           -2,3:
-            0: 140
+            1: 132
+          -1,4:
+            1: 198
+            0: 8
           -3,-7:
-            0: 34816
+            1: 34816
           -3,-6:
-            0: 34952
+            1: 2184
+          -2,-6:
+            0: 62190
           -3,-5:
-            0: 2184
-          -1,-8:
-            0: 60416
-          -1,4:
-            0: 206
-          0,4:
-            0: 127
+            1: 2048
+          -2,-7:
+            1: 28
+            0: 60928
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -801,28 +794,8 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          immutable: True
           moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
           - 0
           - 0
           - 0
@@ -830,16 +803,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.6852
-          - 81.57766
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
           - 0
           - 0
           - 0
@@ -862,7 +825,7 @@ entities:
     - type: Transform
       pos: 0.5,3.5
       parent: 1
-- proto: AirlockExternalGlassEasyPry
+- proto: AirlockExternalGlass
   entities:
   - uid: 4
     components:
@@ -948,33 +911,21 @@ entities:
     - type: Transform
       pos: 3.5,-21.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 125
   - uid: 18
     components:
     - type: Transform
       pos: 7.5,-21.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 128
   - uid: 19
     components:
     - type: Transform
       pos: -6.5,-21.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 124
   - uid: 20
     components:
     - type: Transform
       pos: -2.5,-21.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 127
 - proto: AirlockNfsdGlassLocked
   entities:
   - uid: 21
@@ -1074,7 +1025,7 @@ entities:
       injecting: True
     - type: ContainerContainer
       containers:
-        AmeFuel: !type:ContainerSlot
+        fuelSlot: !type:ContainerSlot
           showEnts: False
           occludes: True
           ent: 38
@@ -1192,8 +1143,6 @@ entities:
       parent: 1
     - type: Apc
       hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
 - proto: AtmosDeviceFanTiny
   entities:
   - uid: 57
@@ -1411,49 +1360,31 @@ entities:
     - type: Transform
       pos: -3.5,-11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1413
   - uid: 98
     components:
     - type: Transform
       pos: -3.5,-10.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1413
   - uid: 99
     components:
     - type: Transform
       pos: 4.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1412
   - uid: 100
     components:
     - type: Transform
       pos: 4.5,-11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1412
   - uid: 101
     components:
     - type: Transform
       pos: 4.5,-10.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1412
   - uid: 102
     components:
     - type: Transform
       pos: -3.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1413
 - proto: BlastDoorExterior1Open
   entities:
   - uid: 103
@@ -4259,19 +4190,19 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,15.5
       parent: 1
-- proto: chem_master
+- proto: ChemistryHotplate
   entities:
-  - uid: 644
+  - uid: 645
     components:
     - type: Transform
-      pos: -4.5,-2.5
+      pos: -4.5,-4.5
       parent: 1
-- proto: ChemistryHotplate
+- proto: ChemMaster
   entities:
-  - uid: 645
+  - uid: 644
     components:
     - type: Transform
-      pos: -4.5,-4.5
+      pos: -4.5,-2.5
       parent: 1
 - proto: ClosetWallMaintenanceFilledRandom
   entities:
@@ -4352,10 +4283,6 @@ entities:
     - type: Transform
       pos: 7.5,-3.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          ents: []
 - proto: ComputerRadar
   entities:
   - uid: 654
@@ -5427,8 +5354,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPassiveVent
@@ -5439,8 +5364,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-27.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasPipeBend
@@ -6205,14 +6128,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 890
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 891
     components:
     - type: Transform
@@ -6497,14 +6412,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 928
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 929
     components:
     - type: Transform
@@ -6728,14 +6635,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 957
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,-7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 958
     components:
     - type: Transform
@@ -7101,14 +7000,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1004
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-22.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1005
     components:
     - type: Transform
@@ -7298,16 +7189,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 1029
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasVentPump
   entities:
   - uid: 1030
@@ -7315,8 +7202,6 @@ entities:
     - type: Transform
       pos: 1.5,-6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1031
@@ -7325,8 +7210,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1032
@@ -7335,8 +7218,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1033
@@ -7345,8 +7226,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1034
@@ -7355,8 +7234,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1035
@@ -7364,8 +7241,6 @@ entities:
     - type: Transform
       pos: 0.5,14.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1036
@@ -7373,8 +7248,6 @@ entities:
     - type: Transform
       pos: 2.5,9.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1037
@@ -7382,8 +7255,6 @@ entities:
     - type: Transform
       pos: -3.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1038
@@ -7392,8 +7263,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1039
@@ -7402,8 +7271,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1040
@@ -7412,8 +7279,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-17.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1041
@@ -7422,8 +7287,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-17.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1042
@@ -7432,8 +7295,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1043
@@ -7442,8 +7303,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1044
@@ -7452,8 +7311,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1045
@@ -7462,8 +7319,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,-24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1046
@@ -7471,8 +7326,6 @@ entities:
     - type: Transform
       pos: -4.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1047
@@ -7481,8 +7334,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -7493,8 +7344,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,11.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1049
@@ -7503,8 +7352,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,15.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1050
@@ -7513,8 +7360,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1051
@@ -7522,8 +7367,6 @@ entities:
     - type: Transform
       pos: -1.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1052
@@ -7531,8 +7374,6 @@ entities:
     - type: Transform
       pos: 3.5,6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1053
@@ -7541,8 +7382,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1054
@@ -7551,8 +7390,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1055
@@ -7560,8 +7397,6 @@ entities:
     - type: Transform
       pos: -7.5,-4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1056
@@ -7569,8 +7404,6 @@ entities:
     - type: Transform
       pos: 7.5,-5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1057
@@ -7579,8 +7412,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1058
@@ -7589,8 +7420,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-18.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1059
@@ -7599,8 +7428,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-18.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1060
@@ -7608,8 +7435,6 @@ entities:
     - type: Transform
       pos: -4.5,-23.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1061
@@ -7617,8 +7442,6 @@ entities:
     - type: Transform
       pos: -2.5,-23.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1062
@@ -7626,8 +7449,6 @@ entities:
     - type: Transform
       pos: 1.5,-23.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1063
@@ -7635,8 +7456,6 @@ entities:
     - type: Transform
       pos: 5.5,-23.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1064
@@ -7645,8 +7464,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasVolumePump
@@ -7657,8 +7474,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -8340,7 +8155,14 @@ entities:
   - uid: 1185
     components:
     - type: Transform
-      pos: 5.1434035,11.657407
+      pos: 4.643673,11.631601
+      parent: 1
+- proto: KitchenReagentGrinder
+  entities:
+  - uid: 1187
+    components:
+    - type: Transform
+      pos: 2.5,11.5
       parent: 1
 - proto: Lamp
   entities:
@@ -8612,6 +8434,20 @@ entities:
     - type: Transform
       pos: -1.5,9.5
       parent: 1
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        blueprint: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: NitrogenCanister
   entities:
   - uid: 1216
@@ -8619,8 +8455,6 @@ entities:
     - type: Transform
       pos: -1.5,0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: OreBox
   entities:
   - uid: 1217
@@ -8657,8 +8491,6 @@ entities:
     - type: Transform
       pos: -1.5,1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: Paper
   entities:
   - uid: 1223
@@ -9667,7 +9499,7 @@ entities:
     - type: Transform
       pos: 7.5,-5.5
       parent: 1
-- proto: RadioHandheld
+- proto: RadioHandheldNF
   entities:
   - uid: 1397
     components:
@@ -9745,7 +9577,7 @@ entities:
   - uid: 1409
     components:
     - type: Transform
-      pos: 5.0965285,11.680844
+      pos: 5.0152006,11.555213
       parent: 1
 - proto: SeedExtractor
   entities:
@@ -9974,6 +9806,27 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,8.5
       parent: 1
+- proto: StructureGunRackNfsd
+  entities:
+  - uid: 1789
+    components:
+    - type: Transform
+      pos: -4.5,9.5
+      parent: 1
+- proto: StructureMeleeWeaponRackNfsd
+  entities:
+  - uid: 1790
+    components:
+    - type: Transform
+      pos: -2.5,9.5
+      parent: 1
+- proto: StructurePistolRackWallmountedNfsd
+  entities:
+  - uid: 1791
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 1
 - proto: SubstationBasic
   entities:
   - uid: 1441
@@ -10033,8 +9886,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-2.5
       parent: 1
-    - type: Physics
-      canCollide: False
 - proto: SurveillanceCameraRouterSecurity
   entities:
   - uid: 1451
@@ -10267,6 +10118,16 @@ entities:
       parent: 1
 - proto: TableReinforced
   entities:
+  - uid: 732
+    components:
+    - type: Transform
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 1186
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 1
   - uid: 1476
     components:
     - type: Transform
@@ -10663,13 +10524,6 @@ entities:
     - type: Transform
       pos: 10.5,-6.5
       parent: 1
-- proto: VendingMachineBooze
-  entities:
-  - uid: 1545
-    components:
-    - type: Transform
-      pos: 2.5,11.5
-      parent: 1
 - proto: VendingMachineBountyVend
   entities:
   - uid: 1546
@@ -10677,13 +10531,6 @@ entities:
     - type: Transform
       pos: -4.5,7.5
       parent: 1
-- proto: VendingMachineChefvend
-  entities:
-  - uid: 1547
-    components:
-    - type: Transform
-      pos: 3.5,11.5
-      parent: 1
 - proto: VendingMachineChemicals
   entities:
   - uid: 1548
@@ -12100,27 +11947,6 @@ entities:
     - type: Transform
       pos: -5.391229,4.418746
       parent: 1
-- proto: StructureGunRackNfsd
-  entities:
-  - uid: 1789
-    components:
-    - type: Transform
-      pos: -4.5,9.5
-      parent: 1
-- proto: StructureMeleeWeaponRackNfsd
-  entities:
-  - uid: 1790
-    components:
-    - type: Transform
-      pos: -2.5,9.5
-      parent: 1
-- proto: StructurePistolRackWallmountedNfsd
-  entities:
-  - uid: 1791
-    components:
-    - type: Transform
-      pos: -3.5,12.5
-      parent: 1
 - proto: Wrench
   entities:
   - uid: 1792
diff --git a/Resources/Maps/_NF/Shuttles/beaker.yml b/Resources/Maps/_NF/Shuttles/beaker.yml
index be5e07780ca..ad04506bc1d 100644
--- a/Resources/Maps/_NF/Shuttles/beaker.yml
+++ b/Resources/Maps/_NF/Shuttles/beaker.yml
@@ -111,6 +111,16 @@ entities:
             19: -2,-11
             20: -3,-11
             69: 4,-7
+        - node:
+            color: '#1861D5FF'
+            id: DeliveryGreyscale
+          decals:
+            77: -4,0
+        - node:
+            color: '#951710FF'
+            id: DeliveryGreyscale
+          decals:
+            76: -4,1
         - node:
             color: '#FFFFFFFF'
             id: LoadingArea
@@ -157,11 +167,6 @@ entities:
             id: WarnBox
           decals:
             70: 4,-7
-        - node:
-            color: '#002CFFFF'
-            id: WarnBoxGreyscale
-          decals:
-            59: -4,1
         - node:
             color: '#950000FF'
             id: WarnBoxGreyscale
@@ -342,16 +347,6 @@ entities:
       - 228
       - 224
       - 229
-- proto: AirCanister
-  entities:
-  - uid: 393
-    components:
-    - type: Transform
-      anchored: True
-      pos: -3.5,1.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: AirlockChemistry
   entities:
   - uid: 154
@@ -452,12 +447,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,1.5
       parent: 1
-    - type: DeviceLinkSource
-      lastSignals:
-        DoorStatus: True
-    - type: Door
-      secondsUntilStateChange: -2733.3945
-      state: Opening
   - uid: 115
     components:
     - type: Transform
@@ -472,64 +461,63 @@ entities:
       parent: 1
     - type: Apc
       hasAccess: True
-      lastExternalState: Good
-      lastChargeState: Full
   - uid: 350
     components:
     - type: Transform
       pos: -5.5,-1.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 34
+  - uid: 58
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-11.5
+      pos: 5.5,-10.5
       parent: 1
   - uid: 74
     components:
     - type: Transform
-      pos: -7.5,1.5
+      rot: 3.141592653589793 rad
+      pos: 7.5,2.5
       parent: 1
   - uid: 78
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: -6.5,2.5
       parent: 1
   - uid: 81
     components:
     - type: Transform
-      pos: 7.5,2.5
+      pos: 0.5,-11.5
       parent: 1
   - uid: 82
     components:
     - type: Transform
-      pos: 8.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,1.5
       parent: 1
   - uid: 100
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -5.5,-9.5
+      pos: 8.5,1.5
       parent: 1
   - uid: 101
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,-10.5
+      pos: 6.5,-9.5
       parent: 1
   - uid: 102
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-10.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-9.5
       parent: 1
   - uid: 103
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-9.5
+      pos: -4.5,-10.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
@@ -1092,18 +1080,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-0.5
       parent: 1
-- proto: chem_master
-  entities:
-  - uid: 163
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 1
-  - uid: 173
-    components:
-    - type: Transform
-      pos: -1.5,-5.5
-      parent: 1
 - proto: ChemDispenser
   entities:
   - uid: 159
@@ -1123,6 +1099,18 @@ entities:
     - type: Transform
       pos: -0.5,-4.5
       parent: 1
+- proto: ChemMaster
+  entities:
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 1
 - proto: ClosetRadiationSuitFilled
   entities:
   - uid: 3
@@ -1315,6 +1303,19 @@ entities:
       parent: 1
     - type: Fixtures
       fixtures: {}
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,0.5
+      parent: 1
+    - type: GasMixer
+      inletOneConcentration: 0.79
+      inletTwoConcentration: 0.21
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 242
@@ -1323,6 +1324,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-0.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeBend
   entities:
   - uid: 230
@@ -1340,11 +1343,11 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 254
+  - uid: 255
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,-0.5
+      pos: -4.5,1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -1457,6 +1460,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-0.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 243
     components:
     - type: Transform
@@ -1493,13 +1498,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-0.5
       parent: 1
-  - uid: 253
-    components:
-    - type: Transform
-      pos: -4.5,-3.5
-      parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 257
     components:
     - type: Transform
@@ -1539,6 +1539,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 369
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
   - uid: 234
@@ -1549,11 +1557,11 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 255
+  - uid: 251
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -1569,11 +1577,22 @@ entities:
     - type: Transform
       pos: -3.5,-6.5
       parent: 1
-  - uid: 251
+  - uid: 254
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,1.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPressurePump
   entities:
   - uid: 57
@@ -1584,13 +1603,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 58
-    components:
-    - type: Transform
-      pos: -3.5,0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 75
     components:
     - type: Transform
@@ -1744,8 +1756,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-0.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: HandLabeler
   entities:
   - uid: 411
@@ -1858,6 +1868,14 @@ entities:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
+- proto: LockerWallMaterialsFuelUraniumFilled
+  entities:
+  - uid: 368
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-9.5
+      parent: 1
 - proto: LuxuryPen
   entities:
   - uid: 89
@@ -1886,6 +1904,26 @@ entities:
     - type: Transform
       pos: -5.5501204,-3.5460114
       parent: 1
+- proto: NitrogenCanister
+  entities:
+  - uid: 371
+    components:
+    - type: Transform
+      anchored: True
+      pos: -3.5,1.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 370
+    components:
+    - type: Transform
+      anchored: True
+      pos: -3.5,0.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
 - proto: PaperBin10
   entities:
   - uid: 64
@@ -2229,17 +2267,11 @@ entities:
     - type: Transform
       pos: 2.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 119
   - uid: 262
     components:
     - type: Transform
       pos: 3.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 119
 - proto: SignalButton
   entities:
   - uid: 119
@@ -2254,7 +2286,7 @@ entities:
         - Pressed: Toggle
         262:
         - Pressed: Toggle
-- proto: SignChemistry1
+- proto: SignChem
   entities:
   - uid: 175
     components:
@@ -2304,12 +2336,6 @@ entities:
       parent: 1
 - proto: SignRadiationMed
   entities:
-  - uid: 286
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-9.5
-      parent: 1
   - uid: 420
     components:
     - type: Transform
@@ -2474,47 +2500,35 @@ entities:
     - type: Transform
       pos: 7.5,3.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 50
     components:
     - type: Transform
       pos: -6.5,3.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 110
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-11.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 111
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -6.5,-9.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 112
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-11.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 113
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-9.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: VendingMachineChemDrobe
   entities:
   - uid: 417
diff --git a/Resources/Maps/_NF/Shuttles/bocadillo.yml b/Resources/Maps/_NF/Shuttles/bocadillo.yml
index 0ea137918ad..e4cc68faae5 100644
--- a/Resources/Maps/_NF/Shuttles/bocadillo.yml
+++ b/Resources/Maps/_NF/Shuttles/bocadillo.yml
@@ -593,7 +593,7 @@ entities:
   - uid: 108
     components:
     - type: Transform
-      pos: -1.5007691,6.5464516
+      pos: -0.43719846,6.5612144
       parent: 2
 - proto: ComputerTabletopShuttle
   entities:
@@ -1166,6 +1166,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,4.5
       parent: 2
+- proto: KitchenAssembler
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      pos: -2.5,6.5
+      parent: 2
 - proto: KitchenDeepFryer
   entities:
   - uid: 175
@@ -1173,12 +1180,12 @@ entities:
     - type: Transform
       pos: -5.5,6.5
       parent: 2
-- proto: KitchenElectricGrill
+- proto: KitchenElectricRange
   entities:
-  - uid: 28
+  - uid: 81
     components:
     - type: Transform
-      pos: -2.5,6.5
+      pos: -1.5,6.5
       parent: 2
 - proto: KitchenMicrowave
   entities:
@@ -1194,18 +1201,6 @@ entities:
     - type: Transform
       pos: -4.5,6.5
       parent: 2
-- proto: LargeBeaker
-  entities:
-  - uid: 81
-    components:
-    - type: Transform
-      pos: -1.2784553,6.725832
-      parent: 2
-  - uid: 107
-    components:
-    - type: Transform
-      pos: -1.0440803,6.569582
-      parent: 2
 - proto: LockerFreezerBase
   entities:
   - uid: 5
@@ -1246,20 +1241,6 @@ entities:
       parent: 2
     - type: Physics
       bodyType: Static
-- proto: OilJarCorn
-  entities:
-  - uid: 86
-    components:
-    - type: Transform
-      pos: -0.38783026,6.741457
-      parent: 2
-- proto: OilJarOlive
-  entities:
-  - uid: 15
-    components:
-    - type: Transform
-      pos: -0.79408026,6.772707
-      parent: 2
 - proto: OxygenCanister
   entities:
   - uid: 238
@@ -1326,12 +1307,26 @@ entities:
     - type: Transform
       pos: 0.5,6.5
       parent: 2
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        blueprint: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: SheetSteel
   entities:
   - uid: 201
     components:
     - type: Transform
-      pos: -1.652667,6.572551
+      pos: -0.46497625,6.6167703
       parent: 2
     - type: Stack
       count: 15
@@ -1504,6 +1499,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,4.5
       parent: 2
+  - uid: 28
+    components:
+    - type: Transform
+      pos: -2.5,6.5
+      parent: 2
   - uid: 129
     components:
     - type: Transform
@@ -1524,11 +1524,6 @@ entities:
     - type: Transform
       pos: -8.5,6.5
       parent: 2
-  - uid: 161
-    components:
-    - type: Transform
-      pos: -2.5,6.5
-      parent: 2
   - uid: 162
     components:
     - type: Transform
@@ -1539,11 +1534,6 @@ entities:
     - type: Transform
       pos: -0.5,6.5
       parent: 2
-  - uid: 173
-    components:
-    - type: Transform
-      pos: -1.5,6.5
-      parent: 2
 - proto: Thruster
   entities:
   - uid: 34
diff --git a/Resources/Maps/_NF/Shuttles/ceres.yml b/Resources/Maps/_NF/Shuttles/ceres.yml
index 7876135d0d2..e55bb843d9e 100644
--- a/Resources/Maps/_NF/Shuttles/ceres.yml
+++ b/Resources/Maps/_NF/Shuttles/ceres.yml
@@ -2482,7 +2482,7 @@ entities:
   - uid: 410
     components:
     - type: Transform
-      pos: 5.4452367,-16.238358
+      pos: 4.4811263,-16.316998
       parent: 2
 - proto: FoodShakerPepper
   entities:
@@ -3746,6 +3746,13 @@ entities:
     - type: Transform
       pos: 3.5,-4.5
       parent: 2
+- proto: KitchenAssembler
+  entities:
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 2
 - proto: KitchenDeepFryer
   entities:
   - uid: 372
@@ -3754,9 +3761,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-17.5
       parent: 2
-- proto: KitchenElectricGrill
+- proto: KitchenElectricRange
   entities:
-  - uid: 223
+  - uid: 370
     components:
     - type: Transform
       pos: 7.5,-16.5
@@ -3766,7 +3773,7 @@ entities:
   - uid: 405
     components:
     - type: Transform
-      pos: 5.541848,-15.96916
+      pos: 4.379413,-16.02996
       parent: 2
 - proto: KitchenMicrowave
   entities:
@@ -4208,6 +4215,20 @@ entities:
     - type: Transform
       pos: 7.5,-12.5
       parent: 2
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        blueprint: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: SheetUranium
   entities:
   - uid: 205
@@ -4963,11 +4984,6 @@ entities:
     - type: Transform
       pos: 5.5,-16.5
       parent: 2
-  - uid: 370
-    components:
-    - type: Transform
-      pos: 7.5,-16.5
-      parent: 2
   - uid: 371
     components:
     - type: Transform
@@ -5120,7 +5136,7 @@ entities:
   - uid: 233
     components:
     - type: Transform
-      pos: 4.6436033,-16.34774
+      pos: 4.0899224,-15.441998
       parent: 2
 - proto: VendingMachineBooze
   entities:
diff --git a/Resources/Maps/_NF/Shuttles/honker.yml b/Resources/Maps/_NF/Shuttles/honker.yml
index 892df3a6b5c..b7bbee69277 100644
--- a/Resources/Maps/_NF/Shuttles/honker.yml
+++ b/Resources/Maps/_NF/Shuttles/honker.yml
@@ -60,50 +60,47 @@ entities:
       version: 2
       data:
         tiles:
+          0,-1:
+            0: 4096
+            1: 40960
           0,0:
-            0: 65535
+            1: 65450
+          -1,0:
+            0: 8
           0,1:
-            0: 61167
-            1: 4112
+            0: 4112
+            1: 17486
+          -1,1:
+            0: 136
           0,2:
-            0: 65535
+            1: 65534
+          -1,2:
+            0: 1032
+            1: 32768
+          0,3:
+            1: 15
+          -1,3:
+            1: 8
           1,0:
-            0: 13105
-            1: 2
+            1: 4352
+            0: 2
           1,1:
-            0: 8193
-            1: 4146
+            0: 4146
           1,2:
-            0: 29553
-            1: 1026
-          0,-1:
-            1: 4096
-            0: 57344
+            1: 12560
+            0: 1026
+          1,3:
+            1: 3
           1,-1:
-            1: 12288
+            0: 12288
           -1,-1:
-            1: 32768
-          -1,2:
-            0: 51392
-            1: 1032
-          -1,0:
-            1: 8
-            0: 34944
-          -1,1:
-            1: 136
             0: 32768
-          0,3:
-            0: 255
-          1,3:
-            0: 119
-          -1,3:
-            0: 204
         uniqueMixes:
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
-          - 21.824879
-          - 82.10312
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -117,8 +114,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
-          - 0
+          - 21.824879
+          - 82.10312
           - 0
           - 0
           - 0
@@ -136,8 +133,6 @@ entities:
   entities:
   - uid: 3
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 1
     - type: InstantAction
@@ -152,37 +147,19 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 281
+      - 161
       - 104
-      - 277
+      - 163
       - 95
-    - type: AtmosDevice
-      joinedGrid: 2
-- proto: AirCanister
-  entities:
-  - uid: 290
-    components:
-    - type: Transform
-      anchored: True
-      pos: 4.5,10.5
-      parent: 2
-    - type: Physics
-      bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: AirlockExternal
   entities:
   - uid: 146
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,1.5
       parent: 2
   - uid: 147
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,1.5
       parent: 2
@@ -198,15 +175,11 @@ entities:
   entities:
   - uid: 144
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,-0.5
       parent: 2
   - uid: 145
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,-0.5
       parent: 2
@@ -218,19 +191,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,6.5
       parent: 2
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 68
+  - uid: 69
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
+      pos: 1.5,-0.5
       parent: 2
-  - uid: 69
+  - uid: 72
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-0.5
+      pos: 3.5,-0.5
       parent: 2
 - proto: AtmosFixBlockerMarker
   entities:
@@ -344,8 +315,6 @@ entities:
   entities:
   - uid: 230
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -353,8 +322,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 247
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
@@ -364,8 +331,6 @@ entities:
   entities:
   - uid: 224
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -373,8 +338,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 228
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -382,8 +345,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 250
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
@@ -391,8 +352,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 254
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
@@ -595,8 +554,6 @@ entities:
   entities:
   - uid: 223
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -604,8 +561,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 245
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
@@ -729,8 +684,6 @@ entities:
   entities:
   - uid: 225
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -738,8 +691,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 227
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -747,8 +698,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 246
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
@@ -756,8 +705,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 249
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
@@ -787,11 +734,11 @@ entities:
       parent: 2
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 82
+  - uid: 182
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 5.5,10.5
+      pos: 4.5,4.5
       parent: 2
 - proto: FaxMachineShip
   entities:
@@ -808,6 +755,19 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,7.5
       parent: 2
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,10.5
+      parent: 2
+    - type: GasMixer
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 108
@@ -815,8 +775,6 @@ entities:
     - type: Transform
       pos: -0.5,5.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasPipeBend
@@ -845,21 +803,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 271
+  - uid: 102
     components:
     - type: Transform
-      pos: 2.5,11.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,9.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 279
+  - uid: 162
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,11.5
+      pos: 2.5,10.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
 - proto: GasPipeStraight
   entities:
   - uid: 90
@@ -901,14 +860,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 265
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,8.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 266
     components:
     - type: Transform
@@ -933,21 +884,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 272
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,11.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 275
-    components:
-    - type: Transform
-      pos: 3.5,10.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 284
     components:
     - type: Transform
@@ -972,24 +908,16 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 287
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,8.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 288
+- proto: GasPipeTJunction
+  entities:
+  - uid: 116
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,9.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,8.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-- proto: GasPipeTJunction
-  entities:
+      color: '#0055CCFF'
   - uid: 121
     components:
     - type: Transform
@@ -998,46 +926,32 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 263
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,10.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
 - proto: GasPort
   entities:
-  - uid: 289
+  - uid: 68
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 4.5,10.5
+      pos: 4.5,9.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasPressurePump
-  entities:
-  - uid: 100
+  - uid: 289
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,10.5
+      pos: 4.5,10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 102
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 164
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,4.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasVentPump
@@ -1051,21 +965,17 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 160
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 277
+  - uid: 163
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 0.5,11.5
+      pos: 1.5,8.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 160
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -1079,21 +989,16 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 160
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 281
+  - uid: 161
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,11.5
+      pos: 3.5,8.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 160
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -1164,12 +1069,11 @@ entities:
     - type: Transform
       pos: 2.5,0.5
       parent: 2
-- proto: hydroponicsTray
+- proto: hydroponicsTrayAnchored
   entities:
   - uid: 75
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: -0.5,11.5
       parent: 2
 - proto: LampBanana
@@ -1177,7 +1081,7 @@ entities:
   - uid: 1
     components:
     - type: Transform
-      pos: 4.787325,9.869072
+      pos: 0.72970486,10.401932
       parent: 2
     - type: HandheldLight
       toggleActionEntity: 3
@@ -1202,6 +1106,24 @@ entities:
     - type: Transform
       pos: 1.5,8.5
       parent: 2
+- proto: LockerWallMaterialsFuelPlasmaFilled
+  entities:
+  - uid: 82
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,10.5
+      parent: 2
+- proto: NitrogenCanister
+  entities:
+  - uid: 143
+    components:
+    - type: Transform
+      anchored: True
+      pos: 4.5,10.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: NitrousOxideCanister
   entities:
   - uid: 103
@@ -1209,8 +1131,16 @@ entities:
     - type: Transform
       pos: 4.5,12.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
+- proto: OxygenCanister
+  entities:
+  - uid: 100
+    components:
+    - type: Transform
+      anchored: True
+      pos: 4.5,9.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: PaintingSadClown
   entities:
   - uid: 198
@@ -1223,34 +1153,29 @@ entities:
   - uid: 12
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.3622794,9.353447
+      pos: 0.38595486,10.704016
       parent: 2
   - uid: 15
     components:
     - type: Transform
-      pos: 4.36545,9.509697
+      pos: 0.6880381,10.735266
       parent: 2
   - uid: 17
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.2216544,9.712822
+      pos: 0.32345486,10.412349
       parent: 2
-- proto: PortableGeneratorPacman
+- proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 72
+  - uid: 180
     components:
     - type: Transform
-      anchored: True
       pos: 5.5,11.5
       parent: 2
-    - type: MaterialStorage
-      storage:
-        Plasma: 3000
+    - type: FuelGenerator
+      on: False
     - type: Physics
       bodyType: Static
-    - type: InsertingMaterialStorage
 - proto: PosterContrabandClown
   entities:
   - uid: 197
@@ -1262,24 +1187,18 @@ entities:
   entities:
   - uid: 109
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,10.5
       parent: 2
   - uid: 142
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,10.5
       parent: 2
   - uid: 203
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,2.5
@@ -1296,8 +1215,6 @@ entities:
   entities:
   - uid: 221
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -1305,22 +1222,11 @@ entities:
     - type: InsideEntityStorage
   - uid: 248
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: SheetPlasma
-  entities:
-  - uid: 148
-    components:
-    - type: Transform
-      pos: 5.5232024,11.547904
-      parent: 2
-    - type: Stack
-      count: 15
 - proto: ShuttleWindow
   entities:
   - uid: 7
@@ -1397,8 +1303,6 @@ entities:
   entities:
   - uid: 229
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -1406,8 +1310,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 252
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
@@ -1452,10 +1354,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,12.5
       parent: 2
-  - uid: 143
+  - uid: 181
     components:
     - type: Transform
-      pos: 4.5,9.5
+      pos: 0.5,10.5
       parent: 2
 - proto: Thruster
   entities:
@@ -1486,8 +1388,6 @@ entities:
   entities:
   - uid: 226
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -1495,8 +1395,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 231
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -1504,8 +1402,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 253
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
@@ -1513,8 +1409,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 255
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
@@ -1543,219 +1437,159 @@ entities:
   entities:
   - uid: 4
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-0.5
       parent: 2
   - uid: 6
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,0.5
       parent: 2
   - uid: 9
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,0.5
       parent: 2
   - uid: 23
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,5.5
       parent: 2
   - uid: 24
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,5.5
       parent: 2
   - uid: 25
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,1.5
       parent: 2
   - uid: 26
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,1.5
       parent: 2
   - uid: 27
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,1.5
       parent: 2
   - uid: 28
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,6.5
       parent: 2
   - uid: 29
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,6.5
       parent: 2
   - uid: 30
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,7.5
       parent: 2
   - uid: 33
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,7.5
       parent: 2
   - uid: 38
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,9.5
       parent: 2
   - uid: 41
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,9.5
       parent: 2
   - uid: 42
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,12.5
       parent: 2
   - uid: 43
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,13.5
       parent: 2
   - uid: 45
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,11.5
       parent: 2
   - uid: 47
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,13.5
       parent: 2
   - uid: 48
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,12.5
       parent: 2
   - uid: 50
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,11.5
       parent: 2
   - uid: 51
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,13.5
       parent: 2
   - uid: 52
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,13.5
       parent: 2
   - uid: 114
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,1.5
       parent: 2
   - uid: 115
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,1.5
       parent: 2
   - uid: 124
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,4.5
       parent: 2
   - uid: 125
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,4.5
       parent: 2
   - uid: 126
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,10.5
       parent: 2
   - uid: 127
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,8.5
       parent: 2
   - uid: 128
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,8.5
       parent: 2
   - uid: 129
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,10.5
       parent: 2
@@ -1863,8 +1697,6 @@ entities:
   entities:
   - uid: 222
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 220
     - type: Physics
@@ -1872,8 +1704,6 @@ entities:
     - type: InsideEntityStorage
   - uid: 251
     components:
-    - type: MetaData
-      flags: InContainer
     - type: Transform
       parent: 244
     - type: Physics
diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml
index 9beb2a762b8..35db7a7e8fc 100644
--- a/Resources/Maps/_NF/Shuttles/mccargo.yml
+++ b/Resources/Maps/_NF/Shuttles/mccargo.yml
@@ -1208,6 +1208,7 @@ entities:
   - uid: 392
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,9.5
       parent: 1
   - uid: 394
@@ -4993,6 +4994,13 @@ entities:
     - type: Transform
       pos: -2.5,2.5
       parent: 1
+- proto: KitchenAssembler
+  entities:
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 1
 - proto: KitchenDeepFryer
   entities:
   - uid: 334
@@ -5001,9 +5009,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,5.5
       parent: 1
-- proto: KitchenElectricGrill
+- proto: KitchenElectricRange
   entities:
-  - uid: 774
+  - uid: 675
     components:
     - type: Transform
       pos: 0.5,7.5
@@ -5022,11 +5030,6 @@ entities:
     - type: Transform
       pos: 2.5,7.5
       parent: 1
-  - uid: 531
-    components:
-    - type: Transform
-      pos: 1.5,7.5
-      parent: 1
 - proto: KitchenReagentGrinder
   entities:
   - uid: 271
@@ -5840,6 +5843,20 @@ entities:
     - type: Transform
       pos: 4.5,8.5
       parent: 1
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        blueprint: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: ShelfKitchen
   entities:
   - uid: 154
@@ -6842,12 +6859,6 @@ entities:
     - type: Transform
       pos: -6.5,6.5
       parent: 1
-  - uid: 675
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,7.5
-      parent: 1
   - uid: 683
     components:
     - type: Transform
diff --git a/Resources/Maps/_NF/Shuttles/piecrust.yml b/Resources/Maps/_NF/Shuttles/piecrust.yml
index a79a438d855..748b3894263 100644
--- a/Resources/Maps/_NF/Shuttles/piecrust.yml
+++ b/Resources/Maps/_NF/Shuttles/piecrust.yml
@@ -586,7 +586,7 @@ entities:
   - uid: 342
     components:
     - type: Transform
-      pos: 0.244216,4.626279
+      pos: -1.7697961,4.5711365
       parent: 8756
 - proto: Bucket
   entities:
@@ -1772,12 +1772,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,0.5
       parent: 8756
+- proto: KitchenAssembler
+  entities:
+  - uid: 354
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 8756
+- proto: KitchenElectricRange
+  entities:
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 8756
 - proto: KitchenKnife
   entities:
   - uid: 341
     components:
     - type: Transform
-      pos: 0.7176666,4.579404
+      pos: -1.1456248,4.5801063
       parent: 8756
 - proto: KitchenMicrowave
   entities:
@@ -1823,7 +1837,7 @@ entities:
   - uid: 340
     components:
     - type: Transform
-      pos: 0.1562469,4.8113184
+      pos: 1.7016171,4.922699
       parent: 8756
 - proto: LockerBotanistFilled
   entities:
@@ -2004,7 +2018,7 @@ entities:
   - uid: 338
     components:
     - type: Transform
-      pos: 1.4957055,4.7544627
+      pos: 0.49917662,1.8947209
       parent: 8756
 - proto: Railing
   entities:
@@ -2043,7 +2057,7 @@ entities:
   - uid: 339
     components:
     - type: Transform
-      pos: 1.1093719,4.5769434
+      pos: 1.6943302,1.5355933
       parent: 8756
 - proto: ServiceTechFab
   entities:
@@ -2052,6 +2066,20 @@ entities:
     - type: Transform
       pos: 4.5,1.5
       parent: 8756
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        blueprint: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: ShuttersNormalOpen
   entities:
   - uid: 229
@@ -2319,11 +2347,6 @@ entities:
     - type: Transform
       pos: -0.5,4.5
       parent: 8756
-  - uid: 262
-    components:
-    - type: Transform
-      pos: 1.5,4.5
-      parent: 8756
   - uid: 263
     components:
     - type: Transform
diff --git a/Resources/Maps/_NF/Shuttles/pts.yml b/Resources/Maps/_NF/Shuttles/pts.yml
index 631bf7be387..de3c00bc5d7 100644
--- a/Resources/Maps/_NF/Shuttles/pts.yml
+++ b/Resources/Maps/_NF/Shuttles/pts.yml
@@ -331,17 +331,19 @@ entities:
     - type: Transform
       pos: 0.5,-1.5
       parent: 2
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 53
+  - uid: 1
     components:
     - type: Transform
-      pos: -3.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-0.5
       parent: 2
-  - uid: 188
+  - uid: 53
     components:
     - type: Transform
-      pos: -3.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -3.5,1.5
       parent: 2
 - proto: AtmosFixBlockerMarker
   entities:
@@ -395,7 +397,6 @@ entities:
       parent: 2
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
 - proto: BenchSofaCorpLeft
@@ -406,8 +407,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-0.5
       parent: 2
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpMiddle
   entities:
   - uid: 56
@@ -416,8 +415,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,0.5
       parent: 2
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpRight
   entities:
   - uid: 54
@@ -426,8 +423,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,1.5
       parent: 2
-    - type: Physics
-      bodyType: Static
 - proto: CableApcExtension
   entities:
   - uid: 132
@@ -1112,6 +1107,14 @@ entities:
     - type: Transform
       pos: 1.5,3.5
       parent: 2
+- proto: LockerWallMaterialsFuelPlasmaFilled
+  entities:
+  - uid: 184
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-4.5
+      parent: 2
 - proto: NitrogenCanister
   entities:
   - uid: 80
@@ -1212,13 +1215,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,3.5
       parent: 2
-- proto: SheetPlasma
-  entities:
-  - uid: 184
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 2
 - proto: ShuttleWindow
   entities:
   - uid: 57
diff --git a/Resources/Maps/_NF/Shuttles/sparrow.yml b/Resources/Maps/_NF/Shuttles/sparrow.yml
index 7804413c435..d93cc0fa35a 100644
--- a/Resources/Maps/_NF/Shuttles/sparrow.yml
+++ b/Resources/Maps/_NF/Shuttles/sparrow.yml
@@ -37,7 +37,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACegAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAADegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAJwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAACWgAAAAABegAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACegAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAADegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAJwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAACWgAAAAABegAAAAAAaQAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -171,11 +171,21 @@ entities:
             47: -6,-1
             48: -6,0
             49: -6,1
+        - node:
+            color: '#1861D5FF'
+            id: DeliveryGreyscale
+          decals:
+            84: 3,-1
         - node:
             color: '#52B4E996'
             id: DeliveryGreyscale
           decals:
             66: 0,5
+        - node:
+            color: '#951710FF'
+            id: DeliveryGreyscale
+          decals:
+            85: 3,-2
         - node:
             color: '#D381C996'
             id: DeliveryGreyscale
@@ -215,48 +225,45 @@ entities:
       data:
         tiles:
           0,0:
-            0: 65535
-          -1,0:
-            0: 65535
-          -1,-1:
-            1: 3
-            0: 65532
+            0: 48063
           0,-1:
-            0: 65527
+            0: 47906
             1: 8
+          -1,0:
+            0: 47551
           0,1:
-            0: 30591
+            0: 13075
             1: 128
+          -1,1:
+            0: 34824
+            1: 48
           0,2:
-            0: 55
+            0: 1
             1: 64
           1,0:
-            0: 32767
+            0: 13175
             1: 32768
           1,1:
-            0: 7
             1: 56
+          1,-1:
+            0: 30528
+            1: 1
           -2,0:
-            0: 52974
+            0: 32972
             1: 8192
           -2,1:
             1: 130
-            0: 12
-          -1,1:
-            0: 52431
-            1: 48
+          -2,-1:
+            0: 52288
+          -1,-1:
+            0: 48008
+            1: 3
           -1,2:
-            0: 140
             1: 64
-          -2,-1:
-            0: 61166
           -1,-2:
-            0: 49152
+            0: 32768
           0,-2:
-            0: 28672
-          1,-1:
-            1: 1
-            0: 65534
+            0: 8192
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -274,7 +281,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -304,10 +311,8 @@ entities:
       parent: 174
     - type: DeviceList
       devices:
-      - 266
       - 243
-    - type: AtmosDevice
-      joinedGrid: 174
+      - 323
   - uid: 361
     components:
     - type: Transform
@@ -316,8 +321,6 @@ entities:
     - type: DeviceList
       devices:
       - 186
-    - type: AtmosDevice
-      joinedGrid: 174
   - uid: 362
     components:
     - type: Transform
@@ -331,20 +334,6 @@ entities:
       - 237
       - 358
       - 359
-    - type: AtmosDevice
-      joinedGrid: 174
-- proto: AirCanister
-  entities:
-  - uid: 307
-    components:
-    - type: Transform
-      anchored: True
-      pos: 3.5,-1.5
-      parent: 174
-    - type: Physics
-      bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 174
 - proto: AirlockCommandGlass
   entities:
   - uid: 264
@@ -420,19 +409,19 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,2.5
       parent: 174
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 20
+  - uid: 21
     components:
     - type: Transform
-      pos: -0.5,-4.5
+      pos: 1.5,-4.5
       parent: 174
-  - uid: 21
+  - uid: 163
     components:
     - type: Transform
-      pos: 1.5,-4.5
+      pos: -0.5,-4.5
       parent: 174
-  - uid: 293
+  - uid: 169
     components:
     - type: Transform
       pos: -3.5,2.5
@@ -530,8 +519,6 @@ entities:
   entities:
   - uid: 75
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,4.5
       parent: 174
@@ -543,10 +530,6 @@ entities:
       canCollide: True
     - type: Airtight
       airBlocked: True
-    - type: DeviceLinkSink
-      links:
-      - 252
-      - 251
 - proto: BoxFolderBlue
   entities:
   - uid: 177
@@ -1079,6 +1062,18 @@ entities:
     - type: Transform
       pos: 3.6195195,1.6693814
       parent: 174
+- proto: GasMixerOnFlipped
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 174
+    - type: GasMixer
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 91
@@ -1086,41 +1081,43 @@ entities:
     - type: Transform
       pos: -4.5,3.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
   - uid: 93
     components:
     - type: Transform
       pos: -2.5,3.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
   - uid: 287
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-3.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 174
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasPipeBend
   entities:
-  - uid: 218
+  - uid: 213
     components:
     - type: Transform
-      pos: 4.5,1.5
+      pos: 4.5,0.5
       parent: 174
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 269
+      color: '#0055CCFF'
+  - uid: 274
     components:
     - type: Transform
-      pos: 5.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-1.5
       parent: 174
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 356
     components:
     - type: Transform
@@ -1199,13 +1196,6 @@ entities:
       parent: 174
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 213
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 174
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 215
     components:
     - type: Transform
@@ -1293,6 +1283,22 @@ entities:
       parent: 174
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 333
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,3.5
+      parent: 174
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 334
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,4.5
+      parent: 174
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 337
     components:
     - type: Transform
@@ -1349,11 +1355,11 @@ entities:
       parent: 174
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 219
+  - uid: 179
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,0.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,1.5
       parent: 174
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -1373,10 +1379,10 @@ entities:
       parent: 174
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 286
+  - uid: 232
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 3.5,0.5
       parent: 174
     - type: AtmosPipeColor
@@ -1389,24 +1395,26 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-1.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
   - uid: 112
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-1.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
-  - uid: 179
+  - uid: 249
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-0.5
+      parent: 174
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 266
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,-1.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPressurePump
@@ -1416,33 +1424,20 @@ entities:
     - type: Transform
       pos: -4.5,1.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
   - uid: 106
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,1.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
-  - uid: 169
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 219
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,-0.5
-      parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 232
-    components:
-    - type: Transform
-      pos: 4.5,-0.5
+      pos: 4.5,2.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasVentPump
@@ -1453,8 +1448,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-0.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 237
@@ -1463,8 +1456,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,0.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 243
@@ -1472,8 +1463,6 @@ entities:
     - type: Transform
       pos: 3.5,2.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 358
@@ -1481,8 +1470,6 @@ entities:
     - type: Transform
       pos: 0.5,6.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -1492,8 +1479,6 @@ entities:
     - type: Transform
       pos: 0.5,2.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 250
@@ -1502,18 +1487,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,1.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 266
+  - uid: 323
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,1.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
+    - type: DeviceNetwork
+      deviceLists:
+      - 76
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 359
@@ -1521,8 +1505,6 @@ entities:
     - type: Transform
       pos: 1.5,6.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -1753,6 +1735,14 @@ entities:
     - type: Transform
       pos: -5.5,1.5
       parent: 174
+- proto: LockerWallMaterialsFuelPlasmaFilled2
+  entities:
+  - uid: 335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,3.5
+      parent: 174
 - proto: MachineArtifactAnalyzer
   entities:
   - uid: 158
@@ -1768,6 +1758,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 174
+- proto: NitrogenCanister
+  entities:
+  - uid: 269
+    components:
+    - type: Transform
+      anchored: True
+      pos: 3.5,-1.5
+      parent: 174
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 218
+    components:
+    - type: Transform
+      anchored: True
+      pos: 3.5,-0.5
+      parent: 174
+    - type: Physics
+      bodyType: Static
 - proto: PaperBin10
   entities:
   - uid: 292
@@ -1776,32 +1786,26 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,2.5
       parent: 174
-- proto: PortableGeneratorPacman
+- proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 163
+  - uid: 286
     components:
     - type: Transform
-      anchored: True
-      pos: 4.5,-1.5
+      pos: 5.5,-1.5
       parent: 174
-    - type: MaterialStorage
-      storage:
-        Plasma: 3000
+    - type: FuelGenerator
+      on: False
     - type: Physics
       bodyType: Static
-    - type: InsertingMaterialStorage
-  - uid: 274
+  - uid: 293
     components:
     - type: Transform
-      anchored: True
-      pos: 5.5,-1.5
+      pos: 4.5,-1.5
       parent: 174
-    - type: MaterialStorage
-      storage:
-        Plasma: 3000
+    - type: FuelGenerator
+      on: False
     - type: Physics
       bodyType: Static
-    - type: InsertingMaterialStorage
 - proto: PowerCellRecharger
   entities:
   - uid: 244
@@ -1814,16 +1818,12 @@ entities:
   entities:
   - uid: 239
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,5.5
       parent: 174
   - uid: 297
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,2.5
@@ -1832,8 +1832,6 @@ entities:
       powerLoad: 0
   - uid: 300
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,9.5
@@ -1842,8 +1840,6 @@ entities:
       powerLoad: 0
   - uid: 301
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,9.5
@@ -1852,8 +1848,6 @@ entities:
       powerLoad: 0
   - uid: 311
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,6.5
@@ -1864,16 +1858,12 @@ entities:
   entities:
   - uid: 270
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-1.5
       parent: 174
   - uid: 295
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-1.5
@@ -1938,13 +1928,6 @@ entities:
     - type: Transform
       pos: -5.5,-2.5
       parent: 174
-- proto: SheetPlasma
-  entities:
-  - uid: 167
-    components:
-    - type: Transform
-      pos: 3.491716,1.719785
-      parent: 174
 - proto: ShuttleWindow
   entities:
   - uid: 6
@@ -2154,15 +2137,11 @@ entities:
     - type: Transform
       pos: -2.5,-1.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
   - uid: 258
     components:
     - type: Transform
       pos: -3.5,-1.5
       parent: 174
-    - type: AtmosDevice
-      joinedGrid: 174
 - proto: SubstationBasic
   entities:
   - uid: 66
@@ -2295,267 +2274,191 @@ entities:
   entities:
   - uid: 1
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-3.5
       parent: 174
   - uid: 2
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,-4.5
       parent: 174
   - uid: 3
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-4.5
       parent: 174
   - uid: 4
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,-2.5
       parent: 174
   - uid: 5
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-2.5
       parent: 174
   - uid: 24
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-3.5
       parent: 174
   - uid: 25
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-2.5
       parent: 174
   - uid: 26
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,-2.5
       parent: 174
   - uid: 27
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-3.5
       parent: 174
   - uid: 28
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-3.5
       parent: 174
   - uid: 29
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-2.5
       parent: 174
   - uid: 30
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,-2.5
       parent: 174
   - uid: 37
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,9.5
       parent: 174
   - uid: 38
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,9.5
       parent: 174
   - uid: 39
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,8.5
       parent: 174
   - uid: 40
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,8.5
       parent: 174
   - uid: 41
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,8.5
       parent: 174
   - uid: 42
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,8.5
       parent: 174
   - uid: 43
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,5.5
       parent: 174
   - uid: 44
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,4.5
       parent: 174
   - uid: 45
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,-1.5
       parent: 174
   - uid: 46
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,5.5
       parent: 174
   - uid: 47
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,4.5
       parent: 174
   - uid: 48
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,-1.5
       parent: 174
   - uid: 60
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,4.5
       parent: 174
   - uid: 61
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,4.5
       parent: 174
   - uid: 62
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,3.5
       parent: 174
   - uid: 64
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,2.5
       parent: 174
   - uid: 65
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,3.5
       parent: 174
   - uid: 68
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,2.5
       parent: 174
   - uid: 69
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,3.5
       parent: 174
   - uid: 70
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,2.5
       parent: 174
   - uid: 71
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,3.5
       parent: 174
   - uid: 73
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,5.5
       parent: 174
   - uid: 74
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,5.5
       parent: 174
   - uid: 78
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,2.5
       parent: 174
   - uid: 83
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,2.5
       parent: 174
   - uid: 84
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,2.5
       parent: 174
diff --git a/Resources/Maps/_NF/Shuttles/stellaris.yml b/Resources/Maps/_NF/Shuttles/stellaris.yml
index 844f66e62cf..63e934dedd2 100644
--- a/Resources/Maps/_NF/Shuttles/stellaris.yml
+++ b/Resources/Maps/_NF/Shuttles/stellaris.yml
@@ -227,65 +227,66 @@ entities:
       data:
         tiles:
           0,0:
-            0: 65535
+            0: 4095
           0,-1:
             0: 65535
-          -1,-1:
-            0: 65535
           -1,0:
-            0: 65535
+            0: 4095
           0,1:
-            0: 65531
-            1: 4
-          0,2:
             0: 65535
+          -1,1:
+            0: 65535
+          0,2:
+            0: 30487
+          -1,2:
+            0: 52236
+            1: 272
           0,3:
-            0: 2047
+            0: 7
+            1: 1920
+          -1,3:
+            0: 12
+            1: 3104
           1,0:
-            0: 30583
+            0: 8977
+            1: 4
           1,1:
-            0: 30583
+            0: 13107
           1,2:
-            0: 275
+            1: 272
+          1,-1:
+            0: 16319
           0,-3:
-            0: 65520
+            1: 240
+            0: 61440
+          -1,-3:
+            1: 224
+            0: 53248
           0,-2:
+            0: 48127
+          -1,-2:
+            0: 56797
+          -1,-1:
             0: 65535
-          1,-3:
-            0: 40816
-            2: 24576
           1,-2:
-            0: 65529
+            0: 9729
             2: 6
-          1,-1:
-            0: 65535
-          2,-2:
-            0: 4096
+          1,-3:
+            0: 32
+            2: 24576
           2,-1:
-            0: 4369
-          -2,-2:
-            0: 65262
+            0: 257
           -2,-1:
-            0: 65535
+            0: 36783
           -2,-3:
-            0: 61120
-          -1,-3:
-            0: 65520
-          -1,-2:
-            0: 65535
+            0: 49280
+          -2,-2:
+            0: 3276
           -2,0:
-            0: 52428
+            1: 4
+            0: 34816
           -2,1:
-            0: 52428
-          -2,2:
-            0: 8
-          -1,1:
-            0: 65533
-            1: 2
-          -1,2:
-            0: 61439
-          -1,3:
-            0: 3310
+            0: 34952
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -303,10 +304,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          immutable: True
           moles:
-          - 20.078888
-          - 75.53487
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -362,8 +363,6 @@ entities:
       - 569
       - 481
       - 601
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 585
     components:
     - type: Transform
@@ -375,9 +374,6 @@ entities:
       - 519
       - 457
       - 566
-      - 598
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 586
     components:
     - type: Transform
@@ -387,12 +383,9 @@ entities:
     - type: DeviceList
       devices:
       - 476
-      - 595
       - 509
       - 623
       - 622
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 587
     components:
     - type: Transform
@@ -402,12 +395,9 @@ entities:
     - type: DeviceList
       devices:
       - 475
-      - 594
       - 510
       - 620
       - 621
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 588
     components:
     - type: Transform
@@ -418,10 +408,7 @@ entities:
       devices:
       - 483
       - 605
-      - 596
       - 569
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 589
     components:
     - type: Transform
@@ -429,14 +416,11 @@ entities:
       parent: 1
     - type: DeviceList
       devices:
-      - 592
       - 497
       - 550
       - 558
       - 559
       - 570
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 590
     components:
     - type: Transform
@@ -445,12 +429,9 @@ entities:
       parent: 1
     - type: DeviceList
       devices:
-      - 599
       - 557
       - 507
       - 570
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 591
     components:
     - type: Transform
@@ -469,7 +450,6 @@ entities:
       - 572
       - 571
       - 531
-      - 593
       - 466
       - 559
       - 558
@@ -484,8 +464,6 @@ entities:
       - 621
       - 623
       - 622
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: AirCanister
   entities:
   - uid: 508
@@ -496,22 +474,16 @@ entities:
       parent: 1
     - type: Physics
       bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: Airlock
   entities:
   - uid: 192
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-4.5
       parent: 1
   - uid: 193
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-4.5
@@ -520,8 +492,6 @@ entities:
   entities:
   - uid: 373
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,9.5
@@ -530,8 +500,6 @@ entities:
   entities:
   - uid: 446
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-4.5
@@ -540,8 +508,6 @@ entities:
   entities:
   - uid: 191
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-7.5
@@ -554,18 +520,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 617
   - uid: 396
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 149
 - proto: AirlockGlassShuttle
   entities:
   - uid: 235
@@ -592,56 +552,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-1.5
       parent: 1
-- proto: AirSensor
-  entities:
-  - uid: 592
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,7.5
-      parent: 1
-  - uid: 593
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 594
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-2.5
-      parent: 1
-  - uid: 595
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,-2.5
-      parent: 1
-  - uid: 596
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-8.5
-      parent: 1
-  - uid: 597
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-7.5
-      parent: 1
-  - uid: 598
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-7.5
-      parent: 1
-  - uid: 599
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,10.5
-      parent: 1
 - proto: APCBasic
   entities:
   - uid: 252
@@ -673,32 +583,37 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,0.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 216
+  - uid: 201
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,-7.5
       parent: 1
-  - uid: 217
+  - uid: 208
     components:
     - type: Transform
-      pos: 8.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-1.5
       parent: 1
-  - uid: 218
+  - uid: 215
     components:
     - type: Transform
-      pos: 8.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-3.5
       parent: 1
-  - uid: 219
+  - uid: 412
     components:
     - type: Transform
-      pos: -7.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-1.5
       parent: 1
-  - uid: 220
+  - uid: 413
     components:
     - type: Transform
-      pos: -7.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-3.5
       parent: 1
 - proto: AtmosFixFreezerMarker
   entities:
@@ -1653,26 +1568,36 @@ entities:
     - type: Transform
       pos: 7.5,-0.5
       parent: 1
-    - type: Physics
-      canCollide: False
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
     - type: ItemSlots
   - uid: 239
     components:
     - type: Transform
       pos: -6.5,-0.5
       parent: 1
-    - type: Physics
-      canCollide: False
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
     - type: ItemSlots
   - uid: 241
     components:
@@ -1680,20 +1605,25 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-4.5
       parent: 1
-    - type: Physics
-      canCollide: False
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
     - type: ItemSlots
 - proto: CrateFreezer
   entities:
-  - uid: 210
+  - uid: 209
     components:
     - type: Transform
-      pos: 5.5,-8.5
+      pos: 6.5,-8.5
       parent: 1
 - proto: CrateFunToyBox
   entities:
@@ -1770,7 +1700,6 @@ entities:
       solutions:
         drink:
           temperature: 293.15
-          canMix: True
           canReact: True
           maxVol: 20
           name: null
@@ -1984,8 +1913,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasPipeBend
@@ -2691,8 +2618,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentPump
@@ -2703,8 +2628,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 466
@@ -2712,8 +2635,6 @@ entities:
     - type: Transform
       pos: 0.5,-2.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 475
@@ -2722,8 +2643,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 476
@@ -2732,8 +2651,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 478
@@ -2742,8 +2659,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 481
@@ -2752,8 +2667,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 483
@@ -2762,8 +2675,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 497
@@ -2771,8 +2682,6 @@ entities:
     - type: Transform
       pos: -3.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 507
@@ -2781,8 +2690,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -2793,8 +2700,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 510
@@ -2803,8 +2708,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 519
@@ -2813,8 +2716,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 531
@@ -2822,8 +2723,6 @@ entities:
     - type: Transform
       pos: 0.5,-0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 550
@@ -2831,8 +2730,6 @@ entities:
     - type: Transform
       pos: 4.5,7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 557
@@ -2840,8 +2737,6 @@ entities:
     - type: Transform
       pos: 1.5,10.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 601
@@ -2849,8 +2744,6 @@ entities:
     - type: Transform
       pos: 1.5,-7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 605
@@ -2859,8 +2752,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-8.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -3024,13 +2915,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-8.5
       parent: 1
-- proto: KitchenMicrowave
-  entities:
-  - uid: 205
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
 - proto: KitchenReagentGrinder
   entities:
   - uid: 206
@@ -3038,19 +2922,19 @@ entities:
     - type: Transform
       pos: 0.5,-8.5
       parent: 1
-- proto: KitchenSpike
+- proto: LockerCaptainFilled
   entities:
-  - uid: 201
+  - uid: 11
     components:
     - type: Transform
-      pos: 6.5,-8.5
+      pos: -1.5,10.5
       parent: 1
-- proto: LockerCaptainFilled
+- proto: LockerWallMaterialsFuelPlasmaFilled2
   entities:
-  - uid: 11
+  - uid: 205
     components:
     - type: Transform
-      pos: -1.5,10.5
+      pos: -4.5,-4.5
       parent: 1
 - proto: MicrophoneInstrument
   entities:
@@ -3060,6 +2944,20 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.3989902,0.9814253
       parent: 1
+- proto: OilJarCorn
+  entities:
+  - uid: 219
+    components:
+    - type: Transform
+      pos: -0.55429995,-8.313418
+      parent: 1
+- proto: OilJarGhee
+  entities:
+  - uid: 210
+    components:
+    - type: Transform
+      pos: -0.26784158,-8.094668
+      parent: 1
 - proto: PianoInstrument
   entities:
   - uid: 250
@@ -3099,8 +2997,6 @@ entities:
   entities:
   - uid: 221
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,-10.5
       parent: 1
@@ -3108,138 +3004,102 @@ entities:
   entities:
   - uid: 43
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-5.5
       parent: 1
   - uid: 108
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,8.5
       parent: 1
   - uid: 110
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,7.5
       parent: 1
   - uid: 111
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,3.5
       parent: 1
   - uid: 121
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,8.5
       parent: 1
   - uid: 124
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,3.5
       parent: 1
   - uid: 142
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,7.5
       parent: 1
   - uid: 162
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,-8.5
       parent: 1
   - uid: 163
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-8.5
       parent: 1
   - uid: 164
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,-8.5
       parent: 1
   - uid: 166
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-5.5
       parent: 1
   - uid: 168
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-1.5
       parent: 1
   - uid: 169
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-1.5
       parent: 1
   - uid: 170
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 7.5,-3.5
       parent: 1
   - uid: 171
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,-3.5
       parent: 1
   - uid: 197
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-5.5
       parent: 1
   - uid: 198
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,10.5
       parent: 1
   - uid: 199
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,10.5
@@ -3400,54 +3260,36 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 399
   - uid: 614
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 399
   - uid: 615
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 399
   - uid: 616
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 399
   - uid: 618
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 59
   - uid: 619
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 627
 - proto: ShuttleWindow
   entities:
   - uid: 27
@@ -3626,14 +3468,6 @@ entities:
     - type: Transform
       pos: -5.5,-8.5
       parent: 1
-- proto: soda_dispenser
-  entities:
-  - uid: 208
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-8.5
-      parent: 1
 - proto: SpacemenFigureSpawner
   entities:
   - uid: 409
@@ -3754,6 +3588,16 @@ entities:
     - type: Transform
       pos: 1.5,-8.5
       parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: 2.5,-8.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 1
   - uid: 243
     components:
     - type: Transform
@@ -3915,7 +3759,6 @@ entities:
       solutions:
         toilet:
           temperature: 293.15
-          canMix: False
           canReact: True
           maxVol: 200
           name: null
@@ -3938,8 +3781,6 @@ entities:
           - data: null
             ReagentId: Hooch
             Quantity: 10
-    - type: Toilet
-      isSeatUp: True
 - proto: TomDrumsInstrument
   entities:
   - uid: 374
@@ -3963,10 +3804,8 @@ entities:
           referenceDistance: 1
           rolloffFactor: 1
           maxDistance: 20
-          busName: Master
           pitch: 1
           volume: 0
-          attenuation: LinearDistanceClamped
         path: /Audio/Weapons/genhit1.ogg
 - proto: VendingMachineAutoTuneVend
   entities:
@@ -3975,20 +3814,6 @@ entities:
     - type: Transform
       pos: -2.5,7.5
       parent: 1
-- proto: VendingMachineChefDrobe
-  entities:
-  - uid: 215
-    components:
-    - type: Transform
-      pos: 3.5,-8.5
-      parent: 1
-- proto: VendingMachineChefvend
-  entities:
-  - uid: 209
-    components:
-    - type: Transform
-      pos: 2.5,-8.5
-      parent: 1
 - proto: VendingMachineCondiments
   entities:
   - uid: 406
@@ -4016,673 +3841,497 @@ entities:
   entities:
   - uid: 2
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,3.5
       parent: 1
   - uid: 3
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -1.5,3.5
       parent: 1
   - uid: 4
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,3.5
       parent: 1
   - uid: 5
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,3.5
       parent: 1
   - uid: 6
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 1.5,3.5
       parent: 1
   - uid: 7
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 2.5,3.5
       parent: 1
   - uid: 8
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,3.5
       parent: 1
   - uid: 9
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -3.5,3.5
       parent: 1
   - uid: 10
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,3.5
       parent: 1
   - uid: 13
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,1.5
       parent: 1
   - uid: 14
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,2.5
       parent: 1
   - uid: 15
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,3.5
       parent: 1
   - uid: 16
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,1.5
       parent: 1
   - uid: 17
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,2.5
       parent: 1
   - uid: 18
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,3.5
       parent: 1
   - uid: 19
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,0.5
       parent: 1
   - uid: 21
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-0.5
       parent: 1
   - uid: 22
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-0.5
       parent: 1
   - uid: 23
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,0.5
       parent: 1
   - uid: 25
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,-0.5
       parent: 1
   - uid: 26
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-0.5
       parent: 1
   - uid: 29
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -6.5,-4.5
       parent: 1
   - uid: 30
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,-4.5
       parent: 1
   - uid: 32
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 7.5,-4.5
       parent: 1
   - uid: 33
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-5.5
       parent: 1
   - uid: 34
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,-4.5
       parent: 1
   - uid: 35
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,-4.5
       parent: 1
   - uid: 39
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-6.5
       parent: 1
   - uid: 40
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-4.5
       parent: 1
   - uid: 41
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,-4.5
       parent: 1
   - uid: 42
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-4.5
       parent: 1
   - uid: 51
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -5.5,7.5
       parent: 1
   - uid: 52
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 6.5,7.5
       parent: 1
   - uid: 54
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,8.5
       parent: 1
   - uid: 56
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,8.5
       parent: 1
   - uid: 57
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,8.5
       parent: 1
   - uid: 58
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,8.5
       parent: 1
   - uid: 61
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,9.5
       parent: 1
   - uid: 62
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,9.5
       parent: 1
   - uid: 71
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,9.5
       parent: 1
   - uid: 73
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,10.5
       parent: 1
   - uid: 79
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,9.5
       parent: 1
   - uid: 84
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,10.5
       parent: 1
   - uid: 95
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 2.5,9.5
       parent: 1
   - uid: 96
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,9.5
       parent: 1
   - uid: 97
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,-8.5
       parent: 1
   - uid: 98
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,-6.5
       parent: 1
   - uid: 99
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,-7.5
       parent: 1
   - uid: 100
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,-5.5
       parent: 1
   - uid: 101
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-4.5
       parent: 1
   - uid: 102
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-6.5
       parent: 1
   - uid: 103
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-7.5
       parent: 1
   - uid: 104
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -5.5,-9.5
       parent: 1
   - uid: 107
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-5.5
       parent: 1
   - uid: 116
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,-0.5
       parent: 1
   - uid: 117
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-7.5
       parent: 1
   - uid: 118
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-9.5
       parent: 1
   - uid: 119
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-5.5
       parent: 1
   - uid: 120
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,-9.5
       parent: 1
   - uid: 122
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-10.5
       parent: 1
   - uid: 123
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-8.5
       parent: 1
   - uid: 125
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-9.5
       parent: 1
   - uid: 126
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-10.5
       parent: 1
   - uid: 127
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-9.5
       parent: 1
   - uid: 128
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-9.5
       parent: 1
   - uid: 129
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-9.5
       parent: 1
   - uid: 130
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-8.5
       parent: 1
   - uid: 131
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-6.5
       parent: 1
   - uid: 132
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-9.5
       parent: 1
   - uid: 133
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,-9.5
       parent: 1
   - uid: 134
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-6.5
       parent: 1
   - uid: 135
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,-9.5
       parent: 1
   - uid: 136
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-10.5
       parent: 1
   - uid: 137
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-9.5
       parent: 1
   - uid: 138
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -1.5,-9.5
       parent: 1
   - uid: 139
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 7.5,-8.5
       parent: 1
   - uid: 140
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -7.5,-0.5
       parent: 1
   - uid: 141
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -7.5,-4.5
       parent: 1
   - uid: 143
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,-5.5
       parent: 1
   - uid: 144
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-6.5
       parent: 1
   - uid: 145
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 7.5,-9.5
       parent: 1
   - uid: 146
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-9.5
       parent: 1
   - uid: 147
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -5.5,-10.5
       parent: 1
   - uid: 148
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-9.5
       parent: 1
   - uid: 390
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -4.5,1.5
       parent: 1
   - uid: 439
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 5.5,1.5
       parent: 1
   - uid: 561
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,8.5
       parent: 1
   - uid: 562
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -2.5,8.5
       parent: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
index 47828ed8f58..991045d45f5 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -39,6 +39,16 @@
         acts: [ "Destruction" ]
   - type: StaticPrice
     price: 50
+  - type: Extractable # Frontier
+    grindableSolutionName: food # Frontier
+  - type: SolutionContainerManager # Frontier
+    solutions: # Frontier
+      food: # Frontier
+        reagents: # Frontier
+        - ReagentId: Ethanol # Frontier
+          Quantity: 5 # Frontier
+        - ReagentId: Sugar # Frontier
+          Quantity: 15 # Frontier
 
 - type: entity
   parent: ShardCrystalBase
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 9ec8d541edf..2533ba85b81 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -720,13 +720,13 @@
   - type: Appearance
   - type: Food
   - type: BadFood
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: Vitamin
-          Quantity: 3
+  # - type: SolutionContainerManager # Frontier: no eating bones
+  #   solutions: # Frontier
+  #     food: # Frontier
+  #       maxVol: 5 # Frontier
+  #       reagents: # Frontier
+  #       - ReagentId: Vitamin # Frontier
+  #         Quantity: 3 # Frontier
 
 - type: entity
   parent: MaterialBones
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 1431cfceb01..b89dd3c1891 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -485,10 +485,12 @@
   - type: Tool
     qualities:
       - Digging
+    speedModifier: 0.5 # Frontier
     useSound:
       path: /Audio/Nyanotrasen/Items/shovel_dig.ogg
-  - type: EarthDigging
+  # - type: EarthDigging # Frontier
   - type: Shovel
+  - type: ToolTileCompatible # Frontier
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 4ea5dc3f3a7..f6b9b0d129c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -309,12 +309,14 @@
       types:
         Heat: 14
   # mining laser real
-  - type: GatheringProjectile
+#  - type: GatheringProjectile # Frontier
   - type: Tag
     tags:
     - EmitterBolt
   - type: TimedDespawn
     lifetime: 3
+  - type: Reflective # Frontier
+    reflective: ShuttleKinetic # Frontier
 
 - type: entity
   name: watcher bolt
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index ec2c577f94c..cb3e58ad6b1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -582,6 +582,7 @@
       - TelecomServerCircuitboard
       - MassMediaCircuitboard
       - ReagentGrinderIndustrialMachineCircuitboard
+      - JukeboxCircuitBoard
       - DoorElectronics # Nyano
       - FireAlarmElectronics # Nyano
       - FirelockElectronics # Nyano
@@ -591,7 +592,9 @@
       - DeepFryerMachineCircuitboard # Nyano
       - SmallThrusterMachineCircuitboard # Frontier
       - SmallGyroscopeMachineCircuitboard # Frontier
-      - JukeboxCircuitBoard
+      - MedicalAssemblerMachineCircuitboard # Frontier
+      - KitchenAssemblerMachineCircuitboard # Frontier
+      - ElectricRangeMachineCircuitboard # Frontier
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ShuttleGunDusterCircuitboard
@@ -1045,8 +1048,6 @@
       - Jug
       - SyringeCryostasis
       - ClothingOuterHardsuitMedical # Frontier
-      - OintmentAdvancedNF # Frontier
-      - BrutepackAdvancedNF # Frontier      
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget
@@ -1527,6 +1528,22 @@
       - FloorTileItemKitchen # Frontier
       - FloorTileItemLaundry # Frontier
       - SheetPaper # Frontier
+      - Carpet # Frontier
+      - CarpetBlack # Frontier
+      - CarpetPink # Frontier
+      - CarpetBlue # Frontier
+      - CarpetGreen # Frontier
+      - CarpetOrange # Frontier
+      - CarpetPurple # Frontier
+      - FloorCarpetItemSkyBlue # Frontier
+      - CarpetCyan # Frontier
+      - CarpetWhite # Frontier
+      - FloorTileItemCarpetClown # Frontier
+      - FloorTileItemCarpetOffice # Frontier
+      - FloorTileItemEighties # Frontier
+      - FloorTileItemArcadeBlue # Frontier
+      - FloorTileItemArcadeBlue2 # Frontier
+      - FloorTileItemArcadeRed # Frontier
     dynamicRecipes:
     - FauxTileAstroGrass # Frontier
     - FauxTileAstroIce # Frontier
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index 298e238f018..1f0d00bb568 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -87,7 +87,7 @@
   - type: LockedAnchorable
   - type: LockedWiresPanel
   - type: AccessReader
-    access: [[ "Engineering" ]]
+    # access: [[ "Engineering" ]] # Frontier
   - type: Machine
     board: EmitterCircuitboard
   - type: GuideHelp
diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml
index 1614c377916..e46fdc6ed40 100644
--- a/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Recipes/Cooking/meal_recipes.yml
@@ -6,6 +6,8 @@
   solids:
     FoodBreadPlain: 1
     FoodFlyAmanita: 3
+  recipeType: # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCheeseCurds
@@ -13,4 +15,7 @@
   result: FoodCheeseCurds
   time: 5
   solids:
-    FoodCurdCheese: 1
\ No newline at end of file
+    FoodCurdCheese: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
index 1a6492fd927..a7b2f64ea17 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
@@ -10,7 +10,7 @@
         - to: ShelfWood
           completed:
             - !type:SnapToGrid
-              southRotation: true
+              # southRotation: true Frontier
           steps:
             - material: WoodPlank
               amount: 4
@@ -18,7 +18,7 @@
         - to: ShelfMetal
           completed:
             - !type:SnapToGrid
-              southRotation: true
+              # southRotation: true Frontier
           steps:
             - material: Steel
               amount: 5
@@ -26,7 +26,7 @@
         - to: ShelfGlass
           completed:
             - !type:SnapToGrid
-              southRotation: true
+             # southRotation: true Frontier
           steps:
             - material: Glass
               amount: 4
@@ -35,7 +35,7 @@
         - to: ShelfRWood
           completed:
             - !type:SnapToGrid
-              southRotation: true
+              # southRotation: true Frontier
           steps:
             - material: WoodPlank
               amount: 8
@@ -46,7 +46,7 @@
         - to: ShelfRMetal
           completed:
             - !type:SnapToGrid
-              southRotation: true
+              # southRotation: true Frontier
           steps:
             - material: Plasteel
               amount: 5
@@ -60,7 +60,7 @@
         - to: ShelfRGlass
           completed:
             - !type:SnapToGrid
-              southRotation: true
+              # southRotation: true Frontier
           steps:
             - material: Plastic
               amount: 5
@@ -75,7 +75,7 @@
         - to: ShelfBar
           completed:
             - !type:SnapToGrid
-              southRotation: true
+             # southRotation: true Frontier
           steps:
             - material: WoodPlank
               amount: 6
@@ -83,7 +83,7 @@
         - to: ShelfKitchen
           completed:
             - !type:SnapToGrid
-              southRotation: true
+             # southRotation: true Frontier
           steps:
             - material: MetalRod
               amount: 2
@@ -96,7 +96,7 @@
         - to: ShelfChemistry
           completed:
             - !type:SnapToGrid
-              southRotation: true
+              # southRotation: true Frontier
           steps:
             - material: Plasteel
               amount: 2
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 3ed51c869d0..9661e2d2c13 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -5,6 +5,7 @@
   time: 5
   solids:
     FoodDoughSlice: 1 # one third of a standard bread dough recipe
+  recipeType: Oven # Frontier
 
 #Bagels
 - type: microwaveMealRecipe
@@ -14,6 +15,7 @@
   time: 5
   solids:
     FoodDoughRope: 1 # created by rolling a dough slice.
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBagelPoppy
@@ -23,6 +25,7 @@
   solids:
     FoodDoughRope: 1
     PoppySeeds: 1
+  recipeType: Oven # Frontier
 
 #Burgers
 
@@ -34,6 +37,7 @@
   solids:
     FoodBreadBun: 1
     OrganHumanAppendix: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBaconBurger
@@ -44,6 +48,7 @@
     FoodBreadBun: 1
     FoodMeatBacon: 1
     FoodCheeseSlice: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBaseballBurger
@@ -53,6 +58,7 @@
   solids:
     FoodBreadBun: 1
     BaseBallBat: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBearger
@@ -62,6 +68,7 @@
   solids:
     FoodBreadBun: 1
     FoodMeatBear: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBigBiteBurger
@@ -74,6 +81,7 @@
     FoodCheeseSlice: 1
     FoodTomato: 1
     FoodOnionSlice: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeBrainBurger
@@ -83,6 +91,7 @@
   solids:
     FoodBreadBun: 1
     OrganHumanBrain: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCatBurger
@@ -93,6 +102,7 @@
     FoodBreadBun: 1
     FoodMeat: 1
     ClothingHeadHatCatEars: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeCheeseburger
@@ -103,6 +113,7 @@
     FoodBreadBun: 1
     FoodMeat: 1
     FoodCheeseSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeChickenSandwich
@@ -114,6 +125,7 @@
   solids:
     FoodBreadBun: 1
     FoodMeatChicken: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeClownBurger
@@ -123,6 +135,7 @@
   solids:
     FoodBreadBun: 1
     ClothingMaskClown: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCorgiBurger
@@ -132,6 +145,7 @@
   solids:
     FoodBreadBun: 1
     FoodMeatCorgi: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeCrabBurger
@@ -141,6 +155,7 @@
   solids:
     FoodBreadBun: 1
     FoodMeatCrab: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCrazyHamburger
@@ -157,6 +172,7 @@
     FoodCabbage: 1
     CrayonGreen: 1
     Flare: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeDuckBurger
@@ -167,6 +183,7 @@
     FoodBreadBun: 1
     FoodMeatDuck: 1
     FoodCheeseSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeEmpoweredBurger
@@ -176,6 +193,7 @@
   solids:
     FoodBreadBun: 1
     SheetPlasma1: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCarpBurger
@@ -186,6 +204,7 @@
     FoodBreadBun: 1
     FoodMeatFish: 1
     FoodCheeseSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeFiveBurger
@@ -196,6 +215,7 @@
     FoodBreadBun: 1
     FoodMeat: 1
     FoodChiliPepper: 3
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeGhostBurger
@@ -205,6 +225,7 @@
   solids:
     FoodBreadBun: 1
     Ectoplasm: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeHumanBurger
@@ -214,6 +235,7 @@
   solids:
     FoodBreadBun: 1
     FoodMeatHuman: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeJellyBurger
@@ -223,6 +245,7 @@
   solids:
     FoodBreadBun: 1
     FoodJellyAmanita: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBurgerMcguffin
@@ -233,6 +256,7 @@
     FoodBreadBun: 1
     FoodCheeseSlice: 1
     FoodEgg: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBurgerMcrib
@@ -243,6 +267,7 @@
     FoodBreadBun: 1
     FoodMealRibs: 1
     FoodOnionSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMimeBurger
@@ -252,6 +277,7 @@
   solids:
     FoodBreadBun: 1
     ClothingMaskMime: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipePlainBurger
@@ -261,6 +287,7 @@
   solids:
     FoodBreadBun: 1
     FoodMeat: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeRatBurger
@@ -270,6 +297,7 @@
   solids:
     FoodBreadBun: 1
     FoodMeatRat: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeRobotBurger
@@ -280,6 +308,7 @@
     FoodBreadBun: 1
     CapacitorStockPart: 2
     # i would add steel to this recipe but the microwave explodes
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeSoylentBurger
@@ -290,6 +319,7 @@
     FoodBreadBun: 1
     FoodCheeseSlice: 2
     FoodSoybeans: 2 #replace with soylent green when those become craftable
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeSpellBurger
@@ -299,6 +329,7 @@
   solids:
     FoodBreadBun: 1
     ClothingHeadHatWizard: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeSuperBiteBurger
@@ -313,6 +344,7 @@
     FoodCheeseSlice: 2
     FoodTomato: 2
     FoodEgg: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTofuBurger
@@ -322,6 +354,7 @@
   solids:
     FoodBreadBun: 1
     FoodTofuSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeXenoburger
@@ -331,6 +364,7 @@
   solids:
     FoodBreadBun: 1
     FoodMeatXeno: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMothRoachburger
@@ -339,6 +373,7 @@
   solids:
     FoodBreadBun: 1
     MobMothroach: 1
+  recipeType: Oven # Frontier
 
 #Breads & Sandwiches
 
@@ -350,6 +385,7 @@
   solids:
     FoodDough: 1
     FoodBanana: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCornbread
@@ -358,6 +394,7 @@
   time: 10
   solids:
     FoodDoughCornmeal: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCreamCheeseBread
@@ -369,6 +406,7 @@
   solids:
     FoodDough: 1
     FoodCheeseSlice: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMeatBread
@@ -379,6 +417,7 @@
     FoodDough: 1
     FoodMeatCutlet: 2
     FoodCheeseSlice: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMimanaBread
@@ -390,6 +429,7 @@
   solids:
     FoodDough: 1
     FoodMimana: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBread
@@ -398,6 +438,7 @@
   time: 10
   solids:
     FoodDough: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBreadCotton
@@ -406,6 +447,8 @@
   time: 10
   solids:
     FoodDoughCotton: 1
+  recipeType: # Frontier
+  - Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeSausageBread
@@ -415,6 +458,7 @@
   solids:
     FoodDough: 1
     FoodMeat: 1 #replace with sausage
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeSpiderMeatBread
@@ -425,6 +469,7 @@
     FoodDough: 1
     FoodMeatSpiderCutlet: 2
     FoodCheeseSlice: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTofuBread
@@ -434,6 +479,7 @@
   solids:
     FoodDough: 1
     FoodTofu: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeXenoMeatBread
@@ -444,6 +490,7 @@
     FoodDough: 1
     FoodMeatXenoCutlet: 2
     FoodCheeseSlice: 2
+  recipeType: Oven # Frontier
 
 #Slices Only
 
@@ -457,6 +504,7 @@
     Blackpepper: 5
   solids:
     FoodDough: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBaguetteSword
@@ -470,6 +518,7 @@
   solids:
     FoodDough: 1
     PartRodMetal1: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeButteredToast
@@ -479,6 +528,7 @@
   solids:
     FoodBreadPlainSlice: 1
     FoodButterSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeFrenchToast
@@ -490,6 +540,7 @@
     Egg: 12
   solids:
     FoodBreadPlainSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeGarlicBread
@@ -500,6 +551,7 @@
     FoodBreadPlainSlice: 1
     FoodGarlic: 1
     FoodButterSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeJellyToast
@@ -509,6 +561,7 @@
   solids:
     FoodBreadPlainSlice: 1
     FoodJellyAmanita: 1 #replace with jelly
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMoldyBreadSlice
@@ -518,6 +571,7 @@
   solids:
     FoodBreadPlainSlice: 1
     FoodFlyAmanita: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTwoBreadSlice
@@ -528,6 +582,7 @@
     Wine: 5
   solids:
     FoodBreadPlainSlice: 2
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeOnionRings
@@ -536,6 +591,7 @@
   time: 15
   solids:
     FoodOnionSlice: 1
+  recipeType: Oven # Frontier
 
 #Pizzas TODO: contruction graph based pizza
 - type: microwaveMealRecipe
@@ -547,6 +603,7 @@
     FoodDoughFlat: 1
     FoodCheeseSlice: 1
     FoodTomato: 4
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMushroomPizza
@@ -556,6 +613,7 @@
   solids:
     FoodDoughFlat: 1
     FoodMushroom: 5
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMeatPizza
@@ -567,6 +625,7 @@
     FoodMeat: 3
     FoodCheeseSlice: 1
     FoodTomato: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeVegetablePizza
@@ -579,6 +638,7 @@
     FoodCarrot: 1
     FoodCorn: 1
     FoodTomato: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeHawaiianPizza
@@ -589,6 +649,7 @@
     FoodDoughFlat: 1
     FoodMeatChickenCutlet: 3
     FoodPineappleSlice: 5
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDankPizza
@@ -600,6 +661,7 @@
     LeavesCannabis: 2
     FoodCheeseSlice: 1
     FoodTomato: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketPizza
@@ -611,6 +673,7 @@
     FoodDonkpocketWarm: 3
     FoodCheeseSlice: 1
     FoodTomato: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeUraniumPizza
@@ -622,6 +685,7 @@
     FoodChiliPepper: 2
     FoodTomato: 2
     SheetUranium1: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCottonPizza
@@ -631,6 +695,7 @@
   solids:
     FoodDoughCottonFlat: 1
     CottonBol: 4
+  recipeType: Oven # Frontier
 
 #Italian
 - type: microwaveMealRecipe
@@ -643,6 +708,7 @@
     Egg: 6
   solids:
     FoodButter: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipePastaTomato
@@ -652,6 +718,7 @@
   solids:
     FoodNoodlesBoiled: 1
     FoodTomato: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMeatballSpaghetti
@@ -661,6 +728,7 @@
   solids:
     FoodNoodlesBoiled: 1
     FoodMeatMeatball: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeButterNoodles
@@ -670,6 +738,7 @@
   solids:
     FoodNoodlesBoiled: 1
     FoodButter: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeChowMein
@@ -683,6 +752,7 @@
     FoodEggplant: 1
     FoodCarrot: 1
     FoodCorn: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeOatmeal
@@ -694,6 +764,7 @@
     Water: 10
   solids:
     FoodBowlBig: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBoiledRice
@@ -705,6 +776,7 @@
     Water: 10
   solids:
     FoodBowlBig: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeRicePudding
@@ -717,6 +789,7 @@
     Sugar: 5
   solids:
     FoodBowlBig: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeRicePork
@@ -726,6 +799,7 @@
   solids:
     FoodRiceBoiled: 1
     FoodMeatCutlet: 3
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeRiceGumbo
@@ -736,6 +810,7 @@
     FoodRiceBoiled: 1
     FoodMeatCutlet: 3
     FoodChiliPepper: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeEggRice
@@ -747,6 +822,7 @@
   solids:
     FoodRiceBoiled: 1
     FoodCarrot: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCopypasta
@@ -755,6 +831,7 @@
   time: 10
   solids:
     FoodNoodles: 2
+  recipeType: Oven # Frontier
 
 #Soups & Stew
 - type: microwaveMealRecipe
@@ -769,6 +846,7 @@
     FoodTomato: 1
     FoodMushroom: 1
     FoodMeatFish: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMeatballSoup
@@ -782,6 +860,7 @@
     FoodMeatMeatball: 1
     FoodCarrot: 1
     FoodPotato: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeNettleSoup
@@ -795,6 +874,7 @@
     FoodBowlBig: 1
     Nettle: 1
     FoodPotato: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeEyeballSoup
@@ -808,6 +888,7 @@
     OrganHumanEyes: 1
     FoodCarrot: 1
     FoodPotato: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeAmanitaJelly
@@ -819,6 +900,7 @@
     Vodka: 5
   solids:
     FoodFlyAmanita: 3
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeOnionSoup
@@ -831,6 +913,7 @@
     FoodBowlBig: 1
     FoodOnionSlice: 5
     FoodCheeseSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMushroomSoup
@@ -843,6 +926,7 @@
   solids:
     FoodBowlBig: 1
     FoodMushroom: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeStewSoup
@@ -859,6 +943,7 @@
     FoodCarrot: 1
     FoodEggplant: 1
     FoodMushroom: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTomatoSoup
@@ -870,6 +955,7 @@
   solids:
     FoodBowlBig: 1
     FoodTomato: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTomatoBloodSoup
@@ -881,6 +967,7 @@
   solids:
     FoodBowlBig: 1
     FoodBloodTomato: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeWingFangChuSoup
@@ -892,6 +979,7 @@
   solids:
     FoodBowlBig: 1
     FoodMeatXenoCutlet: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeWingFangChuSoupSpider
@@ -903,6 +991,7 @@
   solids:
     FoodBowlBig: 1
     FoodMeatSpider: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeVegetableSoup
@@ -917,6 +1006,7 @@
     FoodCarrot: 1
     FoodPotato: 1
     FoodEggplant: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeClownTearsSoup
@@ -930,6 +1020,7 @@
     FoodBanana: 1
     ShardGlass: 1
     #idk probably replace shard with someting bananium when #14663 merged
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMonkeysDelightSoup
@@ -944,6 +1035,7 @@
     FoodBowlBig: 1
     FoodBanana: 1
     MonkeyCube: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBungoSoup
@@ -956,6 +1048,7 @@
     FoodBowlBig: 1
     FoodBungo: 2
     FoodChiliPepper: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBoiledSnail
@@ -966,6 +1059,8 @@
     Water: 10
   solids:
     FoodMeatSnail: 1
+  recipeType: # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeEscargotSoup
@@ -979,6 +1074,7 @@
     FoodOnionSlice: 1
     FoodButter: 1
     FoodMeatSnailCooked: 1
+  recipeType: Oven # Frontier
 
 #Pies
 
@@ -991,6 +1087,7 @@
     FoodDoughPie: 1
     FoodFlyAmanita: 1
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeApplePie
@@ -1001,6 +1098,7 @@
     FoodDoughPie: 1
     FoodApple: 3
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBaklava
@@ -1011,6 +1109,7 @@
     FoodDoughPie: 1
     FoodSnackPistachios: 1 #i'd rather use a botany crop but we don't have nuts yet
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBananaCreamPie
@@ -1021,6 +1120,7 @@
     FoodDoughPie: 1
     FoodBanana: 3
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBerryClafoutis
@@ -1031,6 +1131,7 @@
     FoodDoughPie: 1
     FoodBerries: 3
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCherryPie
@@ -1041,6 +1142,7 @@
     FoodDoughPie: 1
     FoodCherry: 5
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeFrostyPie
@@ -1051,6 +1153,7 @@
     FoodDoughPie: 1
     FoodChillyPepper: 3
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMeatPie
@@ -1061,6 +1164,7 @@
     FoodDoughPie: 1
     FoodMeat: 3
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 #- type: microwaveMealRecipe
 #  id: RecipePlumpPie
@@ -1071,6 +1175,7 @@
 #    FoodDoughPie: 1
 #    FoodPlumpHelmet: 3 #a big part of me wants to veto this because the item description is a dick joke but i'll write the placeholder anyway
 #    FoodPlateTin: 1
+#  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeXenoPie
@@ -1081,6 +1186,7 @@
     FoodDoughPie: 1
     FoodMeatXeno: 3
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 #Tarts
 
@@ -1096,6 +1202,7 @@
     FoodDoughPie: 1
     FoodSnackChocolateBar: 3
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeGappleTart
@@ -1110,6 +1217,7 @@
     FoodDoughPie: 1
     FoodApple: 2 #in absence of the real gapple i'm substituting one apple with 10u gold (one ingot)
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeGrapeTart
@@ -1123,6 +1231,7 @@
     FoodDoughPie: 1
     FoodGrape: 3
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMimeTart
@@ -1136,6 +1245,7 @@
     FoodDoughPie: 1
     FoodMimana: 3
     FoodPlateTin: 1
+  recipeType: Oven # Frontier
 
 #Other
 
@@ -1149,6 +1259,7 @@
     FoodCheeseSlice: 2
     FoodChiliPepper: 1
     FoodMeatFish: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeSashimi
@@ -1159,6 +1270,7 @@
     TableSalt: 1
   solids:
     FoodMeatFish: 2
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMisoColaSoup
@@ -1169,6 +1281,7 @@
     Cola: 5
   solids:
     FoodSoupMiso: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeLoadedBakedPotato
@@ -1178,6 +1291,7 @@
   solids:
     FoodPotato: 1
     FoodCheeseSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeFries
@@ -1188,6 +1302,7 @@
     TableSalt: 5
   solids:
     FoodPotato: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCheesyFries
@@ -1199,6 +1314,7 @@
   solids:
     FoodPotato: 1
     FoodCheeseSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCarrotFries
@@ -1209,6 +1325,7 @@
     TableSalt: 5
   solids:
     FoodCarrot: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipePopcorn
@@ -1217,6 +1334,9 @@
   time: 20
   solids:
     FoodCorn: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipePancake
@@ -1227,6 +1347,7 @@
     Flour: 5
     Milk: 5
     Egg: 6
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBlueberryPancake
@@ -1239,6 +1360,7 @@
     Egg: 6
   solids:
     FoodBerries: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeWaffles
@@ -1250,6 +1372,7 @@
     Milk: 5
     Egg: 6
     SodaWater: 5
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeWaffleSoy
@@ -1261,6 +1384,7 @@
     MilkSoy: 5
     Egg: 6
     SodaWater: 5
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCookie
@@ -1274,6 +1398,7 @@
   solids:
     FoodButterSlice: 1
     FoodSnackChocolateBar: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeSugarCookie
@@ -1286,6 +1411,7 @@
     Sugar: 10
   solids:
     FoodButterSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeRaisinCookie
@@ -1299,6 +1425,7 @@
     Raisins: 10 # Frontier
   # solids: # Frontier
     # FoodSnackRaisins: 1 # Frontier
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCookieOatmeal
@@ -1311,6 +1438,7 @@
     Sugar: 5
   solids:
     FoodButterSlice: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeChocolateChipPancake
@@ -1323,6 +1451,7 @@
     Egg: 6
   solids:
     FoodSnackChocolateBar: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeAppleCake
@@ -1332,6 +1461,7 @@
   solids:
     FoodCakePlain: 1
     FoodApple: 3
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCarrotCake
@@ -1341,6 +1471,7 @@
   solids:
     FoodCakePlain: 1
     FoodCarrot: 3
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeLemonCake
@@ -1350,6 +1481,7 @@
   solids:
     FoodCakePlain: 1
     FoodLemon: 3
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeLemoonCake
@@ -1360,6 +1492,7 @@
     FoodCakePlain: 1
     FoodLemoon: 2
     FoodBerries: 1 #dark colouring
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeOrangeCake
@@ -1369,6 +1502,7 @@
   solids:
     FoodCakePlain: 1
     FoodOrange: 3
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBlueberryCake
@@ -1378,6 +1512,7 @@
   solids:
     FoodCakePlain: 1
     FoodBerries: 3
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeLimeCake
@@ -1387,6 +1522,7 @@
   solids:
     FoodCakePlain: 1
     FoodLime: 3
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCheeseCake
@@ -1398,6 +1534,7 @@
   solids:
     FoodCakePlain: 1
     FoodCheeseSlice: 3
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipePumpkinCake
@@ -1407,6 +1544,7 @@
   solids:
     FoodCakePlain: 1
     FoodPumpkin: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeClownCake
@@ -1416,6 +1554,7 @@
   solids:
     ClothingMaskClown: 1
     FoodCakePlain: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCake
@@ -1424,6 +1563,7 @@
   time: 15
   solids:
     FoodCakeBatter: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBirthdayCake
@@ -1434,6 +1574,7 @@
     Cream: 5
   solids:
     FoodCakePlain: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeChocolateCake
@@ -1443,6 +1584,7 @@
   solids:
     FoodCakePlain: 1
     FoodSnackChocolateBar: 2
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBrainCake
@@ -1452,6 +1594,7 @@
   solids:
     FoodCakePlain: 1
     OrganHumanBrain: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeSlimeCake
@@ -1462,6 +1605,7 @@
     Slime: 15
   solids:
     FoodCakePlain: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCatCake
@@ -1476,6 +1620,7 @@
     FoodCakePlain: 1
     # FoodSnackRaisins: 1 # Frontier
     OrganAnimalHeart: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBreadDog
@@ -1488,6 +1633,7 @@
     FoodBreadSausage: 1
     OrganAnimalHeart: 1
     FoodSpaceshroomCooked: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDumplings
@@ -1499,6 +1645,7 @@
     UncookedAnimalProteins: 6
   solids:
     FoodDoughSlice: 3
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeBrownies
@@ -1512,6 +1659,7 @@
   solids:
     FoodButter: 2
     FoodSnackChocolateBar: 2
+  recipeType: Oven # Frontier
 
 #Donks i guess
 - type: microwaveMealRecipe
@@ -1521,6 +1669,7 @@
   time: 5
   solids:
     FoodDonkpocket: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeWarmDankpocket
@@ -1529,6 +1678,7 @@
   time: 5
   solids:
     FoodDonkpocketDank: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocketSpicy
@@ -1537,6 +1687,7 @@
   time: 5
   solids:
     FoodDonkpocketSpicy: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocketTeriyaki
@@ -1545,6 +1696,7 @@
   time: 5
   solids:
     FoodDonkpocketTeriyaki: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocketPizza
@@ -1553,6 +1705,7 @@
   time: 5
   solids:
     FoodDonkpocketPizza: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketHonk
@@ -1561,6 +1714,7 @@
   time: 5
   solids:
     FoodDonkpocketHonk: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketBerry
@@ -1569,6 +1723,7 @@
   time: 5
   solids:
     FoodDonkpocketBerry: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketStonk
@@ -1577,6 +1732,7 @@
   time: 5
   solids:
     FoodDonkpocketStonk: 1
+  recipeType: Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketCarp
@@ -1585,6 +1741,7 @@
   time: 5
   solids:
     FoodDonkpocketCarp: 1
+  recipeType: Microwave # Frontier
 
 
 - type: microwaveMealRecipe
@@ -1598,6 +1755,7 @@
     FoodMeatCutlet: 1
     FoodOnionSlice: 1
     FoodTomato: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeColdChili
@@ -1608,6 +1766,7 @@
     Nitrogen: 5
   solids:
     FoodSoupChiliHot: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeClownTears
@@ -1619,6 +1778,7 @@
     FoodOnionSlice: 1
     FoodTomato: 1
     BikeHorn: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeChiliClown
@@ -1632,6 +1792,7 @@
     FoodOnionSlice: 1
     FoodTomato: 1
     ClothingShoesClown: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeQueso
@@ -1644,6 +1805,7 @@
   solids:
     FoodChiliPepper: 1
     FoodCheeseSlice: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeRibs
@@ -1655,6 +1817,7 @@
   solids:
     FoodMeat: 2
     FoodKebabSkewer: 1
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeEnchiladas
@@ -1665,6 +1828,7 @@
     FoodChiliPepper: 2
     FoodMeatCutlet: 1
     FoodCorn: 1
+  recipeType: Oven # Frontier
 
 # SALADS: These should be moved out of the microwave as soon as possible
 - type: microwaveMealRecipe
@@ -1676,6 +1840,7 @@
     FoodBowlBig: 1
     FoodAmbrosiaVulgaris: 3
     FoodApple: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeValidSalad
@@ -1687,6 +1852,7 @@
     FoodAmbrosiaVulgaris: 3
     FoodPotato: 1
     FoodMeatMeatball: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeColeslaw
@@ -1699,6 +1865,7 @@
     FoodBowlBig: 1
     FoodOnionRed: 1
     FoodCabbage: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCaesarSalad
@@ -1713,6 +1880,7 @@
     FoodBreadPlainSlice: 1
     FoodCheeseSlice: 1
     FoodCabbage: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCitrusSalad
@@ -1724,6 +1892,7 @@
     FoodOrange: 1
     FoodLemon: 1
     FoodLime: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeKimchiSalad
@@ -1737,6 +1906,7 @@
     FoodCarrot: 1
     FoodCabbage: 1
     FoodGarlic: 1
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeFruitSalad
@@ -1749,6 +1919,7 @@
     FoodApple: 1
     FoodGrape: 1
     FoodWatermelonSlice: 2
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeJungleSalad
@@ -1761,6 +1932,7 @@
     FoodApple: 1
     FoodGrape: 1
     FoodWatermelonSlice: 2
+  recipeType: Assembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeWatermelonFruitBowlSalad
@@ -1774,6 +1946,7 @@
     FoodLemon: 1
     FoodOrange: 1
     FoodAmbrosiaVulgaris: 1
+  recipeType: Assembler # Frontier
 
 # NOT ACTUAL FOOD
 
@@ -1784,6 +1957,9 @@
   time: 10
   solids:
     LeavesTea: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDriedTobacco
@@ -1792,6 +1968,9 @@
   time: 10
   solids:
     LeavesTobacco: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDriedCannabis
@@ -1800,6 +1979,9 @@
   time: 10
   solids:
     LeavesCannabis: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeDriedCannabisRainbow
@@ -1808,6 +1990,9 @@
   time: 10
   solids:
     LeavesCannabisRainbow: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTrashBakedBananaPeel
@@ -1816,6 +2001,9 @@
   time: 5
   solids:
     TrashBananaPeel: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 # Suppermatter
 - type: microwaveMealRecipe
@@ -1829,6 +2017,8 @@
     Sugar: 30
     Nitrogen: 10
     Plasma: 10
+  recipeType: # Frontier
+  - Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeFoodBakedChevreChaud
@@ -1838,6 +2028,9 @@
   solids:
     FoodChevreSlice: 1
     FoodBreadBaguetteSlice: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCookedSpaceshroom
@@ -1846,6 +2039,9 @@
   time: 5
   solids:
     FoodSpaceshroom: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCannabisButter
@@ -1855,6 +2051,8 @@
   solids:
     FoodButter: 1
     LeavesCannabis: 6
+  recipeType: # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCannabisBrownies
@@ -1868,6 +2066,7 @@
   solids:
     FoodCannabisButter: 2
     FoodSnackChocolateBar: 2
+  recipeType: Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCornInButter
@@ -1878,6 +2077,9 @@
     FoodCorn: 1
     FoodPlate: 1
     FoodButter: 1
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipePeaSoup
@@ -1889,6 +2091,9 @@
     FoodBowlBig: 1
   reagents:
     Water: 10
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTacoShell
@@ -1897,6 +2102,9 @@
   time: 5
   solids:
     FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe
+  recipeType: # Frontier
+  - Oven # Frontier
+  - Microwave # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTacoBeef
@@ -1907,6 +2115,8 @@
     FoodTacoShell: 1
     FoodMeatCutlet: 1
     FoodCheeseSlice: 1
+  recipeType: # Frontier
+  - Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTacoChicken
@@ -1917,6 +2127,8 @@
     FoodTacoShell: 1
     FoodMeatChickenCutlet: 1
     FoodCheeseSlice: 1
+  recipeType: # Frontier
+  - Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTacoFish
@@ -1929,6 +2141,8 @@
     FoodOnionSlice: 2
     FoodTomato: 1
     FoodCabbage: 1
+  recipeType: # Frontier
+  - Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTacoRat
@@ -1939,6 +2153,8 @@
     FoodTacoShell: 1
     FoodCheeseSlice: 1
     FoodMeatRat: 1
+  recipeType: # Frontier
+  - Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTacoBeefSupreme
@@ -1952,6 +2168,8 @@
     FoodTomato: 1
     FoodCabbage: 1
     FoodOnionSlice: 2
+  recipeType: # Frontier
+  - Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeTacoChickenSupreme
@@ -1965,6 +2183,8 @@
     FoodTomato: 1
     FoodCabbage: 1
     FoodOnionSlice: 2
+  recipeType: # Frontier
+  - Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeCroissant
@@ -1974,6 +2194,8 @@
   solids:
     FoodCroissantRaw: 1
     FoodButterSlice: 1
+  recipeType: # Frontier
+  - Oven # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeThrowingCroissant
@@ -1984,4 +2206,5 @@
   solids:
     FoodCroissantRaw: 1
     FoodButterSlice: 1
-    ShardGlass: 1
\ No newline at end of file
+    ShardGlass: 1
+  recipeType: Oven # Frontier
diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
index 9d1947f03eb..640953fac09 100644
--- a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
@@ -5,6 +5,7 @@
   time: 10
   solids:
     FoodAloe: 1
+  recipeType: MedicalAssembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeMedicatedSuture
@@ -18,6 +19,7 @@
   reagents:
     TranexamicAcid: 20
     Cryptobiolin: 20
+  recipeType: MedicalAssembler # Frontier
 
 - type: microwaveMealRecipe
   id: RecipeRegenerativeMesh
@@ -31,3 +33,4 @@
   reagents:
     Sigynate: 20
     Dermaline: 20
+  recipeType: MedicalAssembler # Frontier
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index b9a97db51c1..82a81da473d 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -55,8 +55,6 @@
   - ElectricGrillMachineCircuitboard
   - BoozeDispenserMachineCircuitboard
   - SodaDispenserMachineCircuitboard
-  - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board to service research.
-  - ServiceSelectiveDropper # Frontier
 
 - type: technology
   id: AudioVisualCommunication
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 2ee0bb36316..adc2180f589 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1452,7 +1452,8 @@
   sprite: /Textures/Tiles/grass.png
   baseTurf: FloorDirt
   #canCrowbar: false # Come back
-  canShovel: true # Delta V
+  # canShovel: true # Delta V # nuh uh frontier now
+  deconstructTools: [ Digging ] # Frontier
   isSubfloor: true
   footstepSounds:
     collection: FootstepGrass
@@ -1466,7 +1467,8 @@
   sprite: /Textures/Tiles/grassjungle.png
   baseTurf: FloorDirt
   #canCrowbar: false # Come back
-  canShovel: true # Delta V
+  # canShovel: true # Delta V # Frontier
+  deconstructTools: [ Digging ] # Frontier
   isSubfloor: true
   footstepSounds:
     collection: FootstepGrass
@@ -1486,7 +1488,8 @@
   - 1.0
   baseTurf: FloorDirt
   #canCrowbar: false # Come back
-  canShovel: true # Delta V
+  # canShovel: true # Delta V # Frontier
+  deconstructTools: [ Digging ] # Frontier
   isSubfloor: true
   footstepSounds:
     collection: FootstepGrass
@@ -1506,7 +1509,8 @@
   - 1.0
   baseTurf: FloorDirt
   #canCrowbar: false # Come back
-  canShovel: true # Delta V
+  # canShovel: true # Delta V # Frontier
+  deconstructTools: [ Digging ] # Frontier
   isSubfloor: true
   footstepSounds:
     collection: FootstepGrass
@@ -1526,7 +1530,8 @@
   - 1.0
   baseTurf: FloorBedrock # Delta V
   #canCrowbar: false # Come back
-  canShovel: true # Delta V
+  # canShovel: true # Delta V # Frontier
+  deconstructTools: [ Digging ] # Frontier
   footstepSounds:
     collection: FootstepAsteroid
   itemDrop: FloorTileItemDirt # Delta V
diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml
index 4c0b9b69e51..df211465a16 100644
--- a/Resources/Prototypes/Tiles/planet.yml
+++ b/Resources/Prototypes/Tiles/planet.yml
@@ -124,7 +124,8 @@
     West: /Textures/Tiles/Planet/Snow/snow_double_edge_west.png
   baseTurf: FloorDirt
   itemDrop: FloorTileItemSnow # Delta V
-  canShovel: true # Delta V
+  deconstructTools: [ Digging ] # Frontier
+  # canShovel: true # Delta V # Frontier
   isSubfloor: true
   footstepSounds:
     collection: FootstepSnow
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
index 75cfd619224..d339a11f15c 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
@@ -13,6 +13,7 @@
     JetpackMiniFilled: 10
     JetpackBlue: 10
     HandHeldMassScanner: 10
+    AppraisalCartridge: 3
 # Keys
     EncryptionKeyCommon: 3
     EncryptionKeyTraffic: 3
@@ -53,6 +54,7 @@
     JetpackMiniFilled: 4294967295 # Infinite
     JetpackBlue: 4294967295 # Infinite
     HandHeldMassScanner: 4294967295 # Infinite
+    AppraisalCartridge: 4294967295 # Infinite
 # Keys
     EncryptionKeyCommon: 4294967295 # Infinite
     EncryptionKeyTraffic: 4294967295 # Infinite
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml
index 905d32686ed..db2775f1a85 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml
@@ -310,7 +310,6 @@
     - VendingMachineCondiments
     - BoozeDispenserEmpty
     - SodaDispenserEmpty
-    - SyndicateMicrowave # For real
     - SpawnDungeonLootFlatpacksService
     rareChance: 0.40
 
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml
index 643d986aa27..065a9ac25fb 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml
@@ -19,6 +19,25 @@
     - type: AccessReader
       access: [["HeadOfSecurity"], ["HeadOfPersonnel"]]
 
+- type: entity
+  parent: BaseItem
+  id: AppraisalCartridge
+  name: appraisal cartridge
+  description: A program for appraising the monetary value of items
+  components:
+    - type: Sprite
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-y
+    - type: Icon
+      sprite: Objects/Devices/cartridge.rsi
+      state: cart-y
+    - type: UIFragment
+      ui: !type:AppraisalUi
+    - type: Cartridge
+      programName: appraisal-program-name
+      icon: Interface/Actions/shop.png
+    - type: AppraisalCartridge
+
 # Not a PDA cartridge (then why is this here)
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
index b1f0a2c0a6f..e184d3191b7 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
@@ -211,6 +211,7 @@
   id: PortableGeneratorHyperPacmanMachineCircuitboard
   parent: BaseMachineCircuitboard
   name: H.Y.P.E.R.P.A.C.M.A.N.-type portable generator machine board
+  description: A machine printed circuit board for a shredder.
   components:
     - type: Sprite
       state: engineering
@@ -232,6 +233,7 @@
   id: BlueprintLithographMachineCircuitboard
   parent: BaseMachineCircuitboard
   name: blueprint lithograph machine board
+  description: A machine printed circuit board for a blueprint lithograph.
   components:
   - type: Sprite
     state: science
@@ -245,11 +247,79 @@
         amount: 2
         defaultPrototype: Beaker
 
+- type: entity
+  id: ElectricRangeMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: electric range machine board
+  description: A machine printed circuit board for an electric range.
+  components:
+    - type: Sprite
+      state: service
+    - type: MachineBoard
+      prototype: KitchenElectricRange
+      requirements:
+        Capacitor: 3
+      stackRequirements:
+        Steel: 5
+        Glass: 2
+        Cable: 4
+
+- type: entity
+  id: SyndicateElectricRangeMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: syndicate electric range machine board
+  description: A machine printed circuit board for an syndicate electric range.
+  components:
+    - type: Sprite
+      state: service
+    - type: MachineBoard
+      prototype: SyndicateKitchenElectricRange
+      requirements:
+        Capacitor: 3
+      stackRequirements:
+        Steel: 5
+        Glass: 2
+        Cable: 4
+
+- type: entity
+  id: KitchenAssemblerMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: food-o-mat machine board
+  description: A machine printed circuit board for a Food-O-Mat, suitable for a kitchen.
+  components:
+    - type: Sprite
+      state: service
+    - type: MachineBoard
+      prototype: KitchenAssembler
+      requirements:
+        Capacitor: 1
+      stackRequirements:
+        Glass: 2
+        Cable: 2
+
+- type: entity
+  id: MedicalAssemblerMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: medical assembler machine board
+  description: A machine printed circuit board for a medical assembler.
+  components:
+    - type: Sprite
+      state: medical
+    - type: MachineBoard
+      prototype: MedicalAssembler
+      requirements:
+        Capacitor: 3
+      stackRequirements:
+        Steel: 5
+        Glass: 2
+        Cable: 4
+
 # Removed from upstream definitions
 - type: entity
   id: MaterialReclaimerMachineCircuitboard
   parent: BaseMachineCircuitboard
   name: material reclaimer machine board
+  description: A machine printed circuit board for a material reclaimer.
   components:
     - type: Sprite
       state: supply
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml
new file mode 100644
index 00000000000..0c51fbfa167
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml
@@ -0,0 +1,327 @@
+# The machines here are to separate out the recipes that different microwave-based machines can make.
+- type: entity
+  id: KitchenElectricRange
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  name: electric range
+  description: A functional range with a range of functions.
+  components:
+  - type: Microwave
+    capacity: 10
+    canMicrowaveIdsSafely: false
+    explosionChance: 0
+    lightningChance: 0
+    beginCookingSound: /Audio/_NF/Machines/egg-timer.ogg
+    foodDoneSound: /Audio/Machines/ding.ogg
+    loopingSound: /Audio/_NF/Effects/silence.ogg
+    validRecipeTypes: Oven
+    canHeat: true
+    canIrradiate: false
+    key: ElectricRangeKey
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerDeviceVisuals.VisualState:
+        enum.MicrowaveVisualizerLayers.Base:
+          Idle: { state: "off_no_door" }
+          Broken: { state: "off_no_door" } # don't care, can't break
+          Cooking: { state: "off_no_door" }
+        enum.MicrowaveVisualizerLayers.BaseUnlit:
+          Idle: { state: "unlit" }
+          Broken: { state: "unlit" } # don't care, can't break
+          Cooking: { state: "cooking_unlit" }
+      enum.PowerDeviceVisuals.Powered:
+        enum.MicrowaveVisualizerLayers.BaseUnlit:
+          True: { visible: true }
+          False: { visible: false }
+      enum.EntityHeaterVisuals.Setting:
+        enum.EntityHeaterVisuals.Setting:
+          Off: { visible: false }
+          Low: { visible: true, state: range_low }
+          Medium: { visible: true, state: range_medium }
+          High: { visible: true, state: range_high }
+  - type: ActivatableUI
+    key: enum.MicrowaveUiKey.ElectricRangeKey
+  - type: DeviceLinkSink
+    ports:
+    - On
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: UserInterface
+    interfaces:
+      enum.MicrowaveUiKey.ElectricRangeKey:
+        type: MicrowaveBoundUserInterface
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1: # The body of the oven
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.30,-0.25,0.30,0.45"
+        density: 600
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+      fix2: # The range
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.30,0.15,0.30,0.45"
+        mask:
+        - TabletopMachineMask
+        layer:
+        - Impassable
+        - MidImpassable
+        - LowImpassable
+        hard: false
+  - type: Sprite
+    sprite: _NF/Structures/Machines/oven.rsi
+    snapCardinals: true
+    layers:
+    - state: off_no_door
+      map: ["enum.MicrowaveVisualizerLayers.Base"]
+    - state: unlit
+      shader: unshaded
+      map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
+    - state: oven_door
+    - map: ["enum.EntityHeaterVisuals.Setting"]
+      state: range_low
+      shader: unshaded
+      visible: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]
+  - type: ApcPowerReceiver
+    powerLoad: 1000 # Assume the range is off.
+  - type: Machine
+    board: ElectricRangeMachineCircuitboard
+  - type: ContainerContainer
+    containers:
+      microwave_entity_container: !type:Container
+      machine_board: !type:Container
+      machine_parts: !type:Container
+  - type: EmptyOnMachineDeconstruct
+    containers:
+    - microwave_entity_container
+  - type: GuideHelp
+    guides:
+    - Chef
+  - type: EntityHeater
+    passivePower: 1000 # Base oven power.
+  - type: PlaceableSurface
+    isPlaceable: false # Prevent items hanging around for a few frames when clicked on the oven.
+  - type: ItemPlacer
+    maxEntities: 4
+    whitelist:
+      components:
+      - Temperature
+
+- type: entity
+  id: SyndicateKitchenElectricRange
+  parent: KitchenElectricRange
+  name: donk co. electric range
+  components:
+  - type: Microwave
+    cookTimeMultiplier: 0.5
+  - type: Sprite
+    sprite: _NF/Structures/Machines/oven_syndie.rsi
+  - type: Machine
+    board: SyndicateElectricRangeMachineCircuitboard
+  - type: FoodRecipeProvider
+    providedRecipes:
+    - RecipeBaguetteSword
+    - RecipeThrowingCroissant
+
+- type: entity
+  id: KitchenAssembler
+  parent: KitchenMicrowave
+  name: food-o-mat
+  description: Assembles and prepares NT-approved meals. You don't know what it's doing in there.
+  components:
+  - type: Microwave
+    explosionChance: 0
+    lightningChance: 0
+    beginCookingSound: /Audio/Machines/machine_switch.ogg
+    foodDoneSound: /Audio/Machines/ding.ogg
+    loopingSound: /Audio/_NF/Machines/assembler.ogg
+    validRecipeTypes: Assembler
+    canHeat: false
+    canIrradiate: false
+    key: AssemblerKey
+  - type: GenericVisualizer #TODO: needs work
+    visuals:
+      enum.PowerDeviceVisuals.VisualState:
+        enum.MicrowaveVisualizerLayers.Base:
+          Idle: { state: "assembler" }
+          Broken: { state: "assembler" }
+          Cooking: { state: "assembler" }
+        enum.MicrowaveVisualizerLayers.BaseUnlit:
+          Idle: { state: "assembler-on-unlit" }
+          Broken: { state: "assembler-broken-unlit" }
+          Cooking: { state: "assembler-running-unlit" }
+        blinky:
+          Idle: { state: "assembler-invisible" }
+          Broken: { state: "assembler-invisible" }
+          Cooking: { state: "assembler-blinky-unlit" }
+        scan:
+          Idle: { state: "assembler-invisible" }
+          Broken: { state: "assembler-invisible" }
+          Cooking: { state: "assembler-scan-unlit" }
+      enum.PowerDeviceVisuals.Powered:
+        enum.MicrowaveVisualizerLayers.BaseUnlit:
+          True: { visible: true }
+          False: { visible: false }
+        blinky:
+          True: { visible: true }
+          False: { visible: false }
+        scan:
+          True: { visible: true }
+          False: { visible: false }
+  - type: Sprite
+    sprite: _NF/Structures/Machines/assembler.rsi
+    drawdepth: SmallObjects
+    snapCardinals: true
+    layers:
+    - state: assembler
+      map: ["enum.MicrowaveVisualizerLayers.Base"]
+    - state: assembler-on-unlit
+      shader: unshaded
+      map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
+      visible: false
+    - state: assembler-invisible
+      shader: unshaded
+      map: ["blinky"]
+      visible: false
+    - state: assembler-invisible
+      shader: unshaded
+      map: ["scan"]
+      visible: false
+  - type: ApcPowerReceiver
+    powerLoad: 400
+  - type: Machine
+    board: KitchenAssemblerMachineCircuitboard
+  - type: ActivatableUI
+    key: enum.MicrowaveUiKey.AssemblerKey
+  - type: UserInterface
+    interfaces:
+      enum.MicrowaveUiKey.AssemblerKey:
+        type: AssemblerBoundUserInterface
+
+- type: entity
+  id: MedicalAssembler
+  parent: [ BaseMachinePowered, ConstructibleMachine, KitchenAssembler]
+  name: medical assembler
+  description: Great for medicine, apparently. You don't know how it works.
+  components:
+  - type: Microwave
+    validRecipeTypes: MedicalAssembler
+    beginCookingSound: /Audio/Machines/machine_switch.ogg
+    foodDoneSound: /Audio/Effects/Shuttle/radar_ping.ogg
+    loopingSound: /Audio/_NF/Machines/medical-assembler.ogg
+    key: MedicalAssemblerKey
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerDeviceVisuals.VisualState:
+        enum.MicrowaveVisualizerLayers.Base:
+          Idle: { state: "mediwave-base" }
+          Broken: { state: "mediwave-base" }
+          Cooking: { state: "mediwave-base" }
+        enum.MicrowaveVisualizerLayers.BaseUnlit:
+          Idle: { state: "mediwave-off-unlit" }
+          Broken: { state: "mediwave-off-unlit" }
+          Cooking: { state: "mediwave-on-unlit" }
+      enum.PowerDeviceVisuals.Powered:
+        enum.MicrowaveVisualizerLayers.BaseUnlit:
+          True: { visible: true }
+          False: { visible: false }
+  - type: Sprite
+    sprite: _NF/Structures/Machines/medical_assembler.rsi
+    snapCardinals: true
+    layers:
+    - state: mediwave-base
+      map: ["enum.MicrowaveVisualizerLayers.Base"]
+    - state: mediwave-off-unlit
+      shader: unshaded
+      map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
+      visible: false
+  - type: ApcPowerReceiver
+    powerLoad: 500
+  - type: Machine
+    board: MedicalAssemblerMachineCircuitboard
+  - type: ActivatableUI
+    key: enum.MicrowaveUiKey.MedicalAssemblerKey
+  - type: UserInterface
+    interfaces:
+      enum.MicrowaveUiKey.MedicalAssemblerKey:
+        type: AssemblerBoundUserInterface
+
+# POI versions of microwave machines
+
+- type: entity
+  id: KitchenMicrowavePOI
+  parent:
+  - BaseStructureDisableToolUse
+  - KitchenMicrowave
+  suffix: POI
+  components:
+  - type: Machine
+    board: Null
+
+- type: entity
+  id: KitchenElectricRangePOI
+  parent:
+  - BaseStructureDisableToolUse
+  - KitchenElectricRange
+  suffix: POI
+  components:
+  - type: Machine
+    board: Null
+
+- type: entity
+  id: KitchenAssemblerPOI
+  parent:
+  - BaseStructureDisableToolUse
+  - KitchenAssembler
+  suffix: POI
+  components:
+  - type: Machine
+    board: Null
+
+- type: entity
+  id: MedicalAssemblerPOI
+  parent:
+  - BaseStructureDisableToolUse
+  - MedicalAssembler
+  suffix: POI
+  components:
+  - type: Machine
+    board: Null
+
+# TODO: move this
+- type: entity
+  id: KitchenReagentGrinderPOI
+  parent:
+  - BaseStructureDisableToolUse
+  - KitchenReagentGrinder
+  suffix: POI
+  components:
+  - type: Machine
+    board: Null
+
+- type: entity
+  id: KitchenDeepFryerPOI
+  parent:
+  - BaseStructureDisableToolUse
+  - KitchenDeepFryer
+  suffix: POI
+  components:
+  - type: Machine
+    board: Null
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
index 178aa6a5642..b5c28706a5f 100644
--- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml
+++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
@@ -24,6 +24,7 @@
   - ShipyardHammer
   - ShipyardHauler
   - ShipyardHarbormaster
+  - ShipyardHonker
   - ShipyardInvestigator
   - ShipyardKestrel
   - ShipyardKilderkin
@@ -35,8 +36,11 @@
   - ShipyardMcDelivery
   - ShipyardPathfinder
   - ShipyardPioneer
+  - ShipyardPlacebo
   - ShipyardProspector
   - ShipyardSearchlight
+  - ShipyardSparrow
+  - ShipyardSkipper
   - ShipyardSpirit
   - ShipyardStasis
   - ShipyardVagabond
@@ -141,6 +145,11 @@
   name: guide-entry-shipyard-hauler
   text: "/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml"
 
+- type: guideEntry
+  id: ShipyardHonker
+  name: guide-entry-shipyard-honker
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/Honker.xml"
+
 - type: guideEntry
   id: ShipyardInvestigator
   name: guide-entry-shipyard-investigator
@@ -196,6 +205,11 @@
   name: guide-entry-shipyard-pioneer
   text: "/ServerInfo/_NF/Guidebook/Shipyard/Pioneer.xml"
 
+- type: guideEntry
+  id: ShipyardPlacebo
+  name: guide-entry-shipyard-placebo
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/Placebo.xml"
+
 - type: guideEntry
   id: ShipyardProspector
   name: guide-entry-shipyard-prospector
@@ -206,6 +220,16 @@
   name: guide-entry-shipyard-searchlight
   text: "/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml"
 
+- type: guideEntry
+  id: ShipyardSparrow
+  name: guide-entry-shipyard-sparrow
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml"
+
+- type: guideEntry
+  id: ShipyardSkipper
+  name: guide-entry-shipyard-skipper
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/Skipper.xml"
+
 - type: guideEntry
   id: ShipyardSpirit
   name: guide-entry-shipyard-spirit
diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
index 3c4b9fed4e9..65b01d5a8f5 100644
--- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
+++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
@@ -178,6 +178,18 @@
     state: hauler
     scale: 1.2, 1.2
 
+- type: entity
+  parent: PosterBase
+  id: ShuttleMapHonker
+  name: "NT Honker"
+  description: "Detailed map of a Honker shuttle."
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+    state: honker
+    scale: 1.2, 1.2
+
 - type: entity
   parent: PosterBase
   id: ShuttleMapInvestigator
@@ -286,6 +298,18 @@
     state: pioneer
     scale: 1.2, 1.2
 
+- type: entity
+  parent: PosterBase
+  id: ShuttleMapPlacebo
+  name: "NC Placebo"
+  description: "Detailed map of a Placebo shuttle."
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+    state: placebo
+    scale: 1.2, 1.2
+
 - type: entity
   parent: PosterBase
   id: ShuttleMapProspector
@@ -310,6 +334,30 @@
     state: searchlight
     scale: 1.2, 1.2
 
+- type: entity
+  parent: PosterBase
+  id: ShuttleMapSparrow
+  name: "NR Sparrow"
+  description: "Detailed map of a Sparrow shuttle."
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+    state: sparrow
+    scale: 1.2, 1.2
+
+- type: entity
+  parent: PosterBase
+  id: ShuttleMapSkipper
+  name: "NC Skipper"
+  description: "Detailed map of a Skipper shuttle."
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+    state: skipper
+    scale: 1.2, 1.2
+
 - type: entity
   parent: PosterBase
   id: ShuttleMapSpirit
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
index 67b99135614..bd4dc5bce53 100644
--- a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
@@ -446,7 +446,7 @@
 # Decorations (bonfire, fireplace)
 - type: construction
   id: Bonfire
-  name: bonefire
+  name: bonfire
   description: What can be better then late evening under the sky with guitar and friends.
   graph: FiresGraph
   startNode: start
diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
index e6675fd0571..c177c6a8bda 100644
--- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
@@ -2,13 +2,15 @@
 
 - type: microwaveMealRecipe
   id: RecipeClurgerBurger
-  name: clippy burger recipe
+  name: clurger recipe
   result: FoodBurgerClurger
   time: 10
   solids:
     FoodBreadBun: 1
     ClothingHeadMailCarrier: 1
     FoodMeatCat: 1
+  recipeType:
+  - Oven
 
 - type: microwaveMealRecipe
   id: RecipeRosyMothRoachburger
@@ -18,6 +20,8 @@
   solids:
     FoodBreadBun: 1
     MobRosyMothroach: 1
+  recipeType:
+  - Oven
 
 #Breads & Sandwiches
 
@@ -29,6 +33,8 @@
   solids:
     FoodBreadPlainSlice: 1
     FoodAvocadoSlice: 1
+  recipeType:
+  - Oven
 
 - type: microwaveMealRecipe
   id: RecipeBreakfastBagel
@@ -40,6 +46,8 @@
     FoodEgg: 2
     FoodAvocadoSlice: 1
     FoodCheeseSlice: 1
+  recipeType:
+  - Oven
 
 - type: microwaveMealRecipe
   id: RecipeBreakfastBagelPoppy
@@ -51,6 +59,8 @@
     FoodEgg: 2
     FoodAvocadoSlice: 1
     FoodCheeseSlice: 1
+  recipeType:
+  - Oven
 
 - type: microwaveMealRecipe
   id: RecipeCucumberSandwich
@@ -63,6 +73,8 @@
     FoodChevreSlice: 1
   reagents:
     Mayo: 5
+  recipeType:
+  - Assembler
 
 # Sushi
 
@@ -78,6 +90,8 @@
   reagents:
     Rice: 15
     Water: 10
+  recipeType:
+  - Assembler
 
 - type: microwaveMealRecipe
   id: RecipeCarpSushi
@@ -91,6 +105,8 @@
   reagents:
     Rice: 15
     Water: 10
+  recipeType:
+  - Assembler
 
 # Salad
 
@@ -106,6 +122,8 @@
     FoodCucumber: 1
     FoodTomato: 1
     FoodChevreSlice: 1
+  recipeType:
+  - Assembler
 
 - type: microwaveMealRecipe
   id: RecipeAvocadoSalad
@@ -120,6 +138,8 @@
     FoodCucumber: 1
     FoodAvocado: 1
     FoodTomato: 1
+  recipeType:
+  - Assembler
 
 #Other
 
@@ -135,6 +155,8 @@
     FoodMealFries: 1
     FoodOnionRings: 1
     OrganAnimalHeart: 1
+  recipeType:
+  - Assembler
 
 - type: microwaveMealRecipe
   id: RecipeDragonOmelette
@@ -148,6 +170,9 @@
     Egg: 12
     TableSalt: 5
     Blackpepper: 5
+  recipeType:
+  - Oven
+  - Microwave
 
 - type: microwaveMealRecipe
   id: RecipeRaisins
@@ -156,6 +181,9 @@
   time: 30
   solids:
     FoodGrape: 5
+  recipeType:
+  - Oven
+  - Microwave
 
 - type: microwaveMealRecipe
   id: RecipePickle
@@ -166,7 +194,9 @@
     FoodCucumber: 1
   reagents:
     Saline: 10
-    
+  recipeType:
+  - Microwave
+
 - type: microwaveMealRecipe
   id: RecipePoachedPears
   name: poached pears recipe
@@ -178,7 +208,9 @@
     FoodOrange: 2
   reagents:
     Wine: 10
-    
+  recipeType:
+  - Assembler
+
 - type: microwaveMealRecipe
   id: RecipePearsBelleHelene
   name: pears belle helene recipe
@@ -191,6 +223,8 @@
     FoodLemon: 1
   reagents:
     Cream: 5
+  recipeType:
+  - Assembler
 
 - type: microwaveMealRecipe
   id: RecipePearMuffin
@@ -204,7 +238,9 @@
     Flour: 5
     Oats: 5
     Sugar: 5
-    
+  recipeType:
+  - Oven
+
 - type: microwaveMealRecipe
   id: RecipePearCheeseTart
   name: pear and cheese tart recipe
@@ -215,6 +251,8 @@
     FoodDoughPie: 1
     FoodPear: 2
     FoodChevre: 1
+  recipeType:
+  - Oven
 
 # NOT ACTUAL FOOD
 
@@ -227,3 +265,6 @@
     FoodSpaceshroom: 1
     FoodMushroom: 1
     FoodFlyAmanita: 1
+  recipeType:
+  - Oven
+  - Microwave
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
index a4f2939b860..f45fd6b39ba 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
@@ -16,6 +16,33 @@
     Steel: 800
     Glass: 900
 
+- type: latheRecipe
+  id: ElectricRangeMachineCircuitboard
+  result: ElectricRangeMachineCircuitboard
+  category: Circuitry
+  completetime: 4
+  materials:
+    Steel: 800
+    Glass: 900
+
+- type: latheRecipe
+  id: KitchenAssemblerMachineCircuitboard
+  result: KitchenAssemblerMachineCircuitboard
+  category: Circuitry
+  completetime: 4
+  materials:
+    Steel: 600
+    Glass: 750
+
+- type: latheRecipe
+  id: MedicalAssemblerMachineCircuitboard
+  result: MedicalAssemblerMachineCircuitboard
+  category: Circuitry
+  completetime: 4
+  materials:
+    Steel: 800
+    Glass: 900
+
 # Thrusters
 - type: latheRecipe
   id: ThrusterSecurityMachineCircuitboard
@@ -90,6 +117,7 @@
     Steel: 50
     Glass: 120
 
+# Generators
 - type: latheRecipe
   id: PortableGeneratorHyperPacmanMachineCircuitboard
   result: PortableGeneratorHyperPacmanMachineCircuitboard
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
deleted file mode 100644
index 389c68ab84f..00000000000
--- a/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: latheRecipe
-  id: BrutepackAdvancedNF
-  result: BrutepackAdvanced1
-  category: MedicalNF
-  completetime: 1
-  materials:
-    Durathread: 100
-    Silver: 50
-
-- type: latheRecipe
-  id: OintmentAdvancedNF
-  result: OintmentAdvanced1
-  category: MedicalNF
-  completetime: 1
-  materials:
-    Durathread: 100
-    Silver: 30
-    Biomass: 10
diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml
index 7c7984fdc86..27aad1e1cda 100644
--- a/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml
@@ -23,3 +23,16 @@
     Stelloxadone: 5
     Water: 3
     Fiber: 2
+
+- type: reaction
+  id: NFOpporozidone
+  minTemp: 400 #Maybe if a method of reducing reagent temp exists one day, this could be -50
+  reactants:
+    Mannitol:
+      amount: 1
+    Plasma:
+      amount: 2
+    Doxarubixadone:
+      amount: 1
+  products:
+    Opporozidone: 3
diff --git a/Resources/Prototypes/_NF/Research/civilianservices.yml b/Resources/Prototypes/_NF/Research/civilianservices.yml
index 6197c0d97a9..e552f23a17d 100644
--- a/Resources/Prototypes/_NF/Research/civilianservices.yml
+++ b/Resources/Prototypes/_NF/Research/civilianservices.yml
@@ -2,7 +2,7 @@
 
 - type: technology
   id: AdvancedPersonalPropulsion
-  name: research-techology-advanced-personal-propulsion
+  name: research-technology-advanced-personal-propulsion
   icon:
     sprite: Objects/Tanks/Jetpacks/void.rsi
     state: icon
@@ -13,14 +13,28 @@
   - JetpackVoid
 
 - type: technology
-  id: AdvancedTopicals
-  name: research-techology-advanced-topicals
+  id: IndustrialMedicine
+  name: research-technology-industrial-medicine
   icon:
-    sprite: Objects/Specific/Medical/medical.rsi
-    state: medicated-suture
+    sprite: _NF/Structures/Machines/medical_assembler.rsi
+    state: icon
   discipline: CivilianServices
-  tier: 3
-  cost: 15000
+  tier: 2
+  cost: 5000
+  recipeUnlocks:
+  - MedicalAssemblerMachineCircuitboard
+
+- type: technology
+  id: AdvancedFoodService
+  name: research-technology-advanced-food-service
+  icon:
+    sprite: _NF/Structures/Machines/oven.rsi
+    state: composite_off
+  discipline: CivilianServices
+  tier: 2
+  cost: 7500
   recipeUnlocks:
-  - BrutepackAdvancedNF
-  - OintmentAdvancedNF
+  - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board to service research.
+  - ServiceSelectiveDropper
+  - KitchenAssemblerMachineCircuitboard
+  - ElectricRangeMachineCircuitboard
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
index ab46bed3c86..66ad1510d1c 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
@@ -12,7 +12,7 @@
   id: Anchor
   name: KC Anchor
   description: A large luxury cruiser capable of long ranged travel acrossed the sector, expedition capable.
-  price: 115000 # $108432 after appraisal +5ish% (~7000) - TODO: fix this value, getting tests to pass - Whatstone
+  price: 140000 # $108432 after appraisal +30ish% (~32000)
   category: Large
   group: Expedition
   shuttlePath: /Maps/_NF/Shuttles/Expedition/anchor.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
index 0fea7b87305..fc1117d8511 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
@@ -12,7 +12,7 @@
   id: Sprinter
   name: KC Sprinter
   description: A light freighter often picked by bounty hunters due to its quick acceleration, expedition capable.
-  price: 66500 # ~51200$ on mapinit + ~15360$ from 30% markup
+  price: 56800 # ~$43700 on mapinit plus ~30% markup
   category: Medium
   group: Expedition
   shuttlePath: /Maps/_NF/Shuttles/Expedition/sprinter.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml
index dd8f7b387a7..c2d2ec4342c 100644
--- a/Resources/Prototypes/_NF/Shipyard/honker.yml
+++ b/Resources/Prototypes/_NF/Shipyard/honker.yml
@@ -1,3 +1,13 @@
+# Author Info
+# GitHub: ???
+# Discord: ???
+
+# Maintainer Info
+# GitHub: ???
+# Discord: ???
+
+# Shuttle Notes:
+#
 - type: vessel
   id: Honker
   name: NT Honker
@@ -6,7 +16,7 @@
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/honker.yml
-  guidebookPage: Null
+  guidebookPage: ShipyardHonker
   class:
   - Civilian
 
diff --git a/Resources/Prototypes/_NF/Shipyard/placebo.yml b/Resources/Prototypes/_NF/Shipyard/placebo.yml
index bce170575e7..2d674a1a661 100644
--- a/Resources/Prototypes/_NF/Shipyard/placebo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/placebo.yml
@@ -1,12 +1,22 @@
+# Author Info
+# GitHub: ???
+# Discord: ???
+
+# Maintainer Info
+# GitHub: ???
+# Discord: ???
+
+# Shuttle Notes:
+# 
 - type: vessel
   id: Placebo
   name: NC Placebo
-  description: A small psychology vessel. Named after the famous Placebo effect
+  description: A small psychology vessel. Named after the famous Placebo effect.
   price: 20000
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/placebo.yml
-  guidebookPage: Null
+  guidebookPage: ShipyardPlacebo
   class:
   - Medical
 
diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml
index 9ad872b8ae8..144de23f9d2 100644
--- a/Resources/Prototypes/_NF/Shipyard/skipper.yml
+++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml
@@ -16,7 +16,7 @@
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/skipper.yml
-  guidebookPage: Null
+  guidebookPage: ShipyardSkipper
   class:
   - Kitchen
 
diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml
index 63ab14ded26..2cbb753ee00 100644
--- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml
+++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml
@@ -16,7 +16,7 @@
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/sparrow.yml
-  guidebookPage: Null
+  guidebookPage: ShipyardSparrow
   class:
   - Science
   - Engineering
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Honker.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Honker.xml
new file mode 100644
index 00000000000..28ede46efcf
--- /dev/null
+++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Honker.xml
@@ -0,0 +1,85 @@
+<Document>
+  # HONKER-CLASS CLOWN SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="VendingMachineTheater"/>
+  <GuideEntityEmbed Entity="StatueBananiumClown"/>
+  <GuideEntityEmbed Entity="CrateToyBox"/>
+  </Box>
+  <Box>
+  <GuideEntityEmbed Entity="ShuttleMapHonker" Caption=""/>
+  </Box>
+    [color=#a4885c]Ship Size:[/color] Small
+	
+	[color=#a4885c]Recommended Crew:[/color] 1-2
+	
+	[color=#a4885c]Power Gen Type:[/color] Plasma
+	
+	[color=#a4885c]Expeditions:[/color] None
+	
+	[color=#a4885c]IFF Console:[/color] None
+	
+  "HONK HONK HONK HONK HONK HONK"
+    
+  # PREFLIGHT CHECKLIST
+  
+  ## 1. Power supply
+  
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SubstationWallBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+  
+  - Check that the APC unit's Main Breaker is toggled on.
+  - Check the APC unit's current Load* (W).
+  
+  ## 1.2. P.A.C.M.A.N. generator unit
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorPacmanShuttle"/>
+  <GuideEntityEmbed Entity="SheetPlasma"/>
+  </Box>
+  
+  - Check that the P.A.C.M.A.N. generator unit is anchored to the floor.
+  - Check that the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+  - Check that the P.A.C.M.A.N. generator unit is set to HV output.
+  - Set Target Power for 9-10** [bold]kW[/bold].
+  - Ensure that the P.A.C.M.A.N. generator unit is enabled.
+  
+  ## 2. Atmospherics
+  
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="AirCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  </Box>
+  
+  - Check that the Air canister is anchored to connector port.
+  - Ensure that the distro loop pump is enabled.
+  
+  ## 2.2. Waste Loop
+  <Box>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  <GuideEntityEmbed Entity="AirAlarm"/>
+  </Box>
+    
+  - Ensure that the waste loop pump is enabled.
+  - Disable Auto Mode on any Air Alarms.
+  - Set the Air Alarms to Filtering (Wide).
+  
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="Gyroscope"/>
+  <GuideEntityEmbed Entity="GravityGeneratorMini"/>
+  </Box>
+  
+  - Check that the gyroscope is anchored, powered, and enabled.
+  - Check that the mini gravity generator is anchored, powered, and enabled.
+  
+  ## Sidenotes
+  
+  * - Honker-class clown ships are equipped with an APC unit that can be used to appraise the ship's total power consumption. An unmodified Honker-class ship requires 8.4 kW of power to remain operational.
+  
+  ** - Honker-class clown ships have low power demand meaning that standard P.A.C.M.A.N. generator unit's Target Power value can be lowered as low as 9 kW. Please note, that recommended Target Power value to avoid blackouts during Gravity Generator charging sequence is 10 kW.
+
+</Document>
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Placebo.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Placebo.xml
new file mode 100644
index 00000000000..73c1cf2baea
--- /dev/null
+++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Placebo.xml
@@ -0,0 +1,77 @@
+<Document>
+  # PLACEBO-CLASS PSYCHOLOGY SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="PsychBed"/>
+  <GuideEntityEmbed Entity="CrateNPCEmotionalSupport"/>
+  <GuideEntityEmbed Entity="PlushieCatBlack"/>
+  </Box>
+  <Box>
+  <GuideEntityEmbed Entity="ShuttleMapPlacebo" Caption=""/>
+  </Box>
+  [color=#a4885c]Ship Size:[/color] Small
+
+  [color=#a4885c]Recommended Crew:[/color] 1-2
+
+  [color=#a4885c]Power Gen Type:[/color] Plasma
+
+  [color=#a4885c]Expeditions:[/color] None
+
+  [color=#a4885c]IFF Console:[/color] None
+
+  "A small psychology vessel. Named after the famous Placebo effect."
+
+  # PREFLIGHT CHECKLIST
+
+  ## 1. Power supply
+  
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SubstationWallBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+  
+  - Check that the substation unit is anchored to the floor.
+  - Check that the APC unit's Main Breaker is toggled on.
+  - Check the APC unit's current Load* (W).
+
+  ## 1.2. P.A.C.M.A.N. generator unit
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorPacmanShuttle"/>
+  <GuideEntityEmbed Entity="SheetPlasma"/>
+  </Box>
+  
+  - Check that the P.A.C.M.A.N. generator units are anchored to the floor.
+  - Check that the P.A.C.M.A.N. generator units have fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+  - Check that the P.A.C.M.A.N. generator units are set to HV output.
+  - Set Target Power to 10-11 [bold]kW[/bold].
+  - Start the P.A.C.M.A.N. generator units.
+
+  ## 2. Atmospherics
+
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="OxygenCanister"/>
+  <GuideEntityEmbed Entity="NitrogenCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  <GuideEntityEmbed Entity="GasMixer"/>
+  </Box>
+
+  - Check if the O2 canister and N2 canister are anchored to their connector ports.
+  - Check if the gas mixer has its mixing ratio and output pressure set correctly.
+  - Enable the gas mixer.
+
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="Gyroscope"/>
+  <GuideEntityEmbed Entity="GravityGeneratorMini"/>
+  </Box>
+
+  - Check that the gyroscope is anchored, powered, and enabled.
+  - Check that the mini gravity generator is anchored, powered, and enabled.
+
+  ## Sidenotes
+
+  * - Placebo-class service ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption. One can check the ship's total power consumption against the P.A.C.M.A.N. generator units Target Power output: to keep substation and APCs fully charged, P.A.C.M.A.N. generator unit Target Power output should exceed the combined load of all APCs. Remember to check APC Loads and adjust the generator unit Target Power after connecting new power-consuming machines. The average combined load of all APCs on a stock model Placebo-class ship is 16'000W when idle.
+
+  ** - Placebo-class service ships have low power demand meaning that the P.A.C.M.A.N. generator unit's Target Power value can be lowered as low as 10 kW. Please note, that recommended Target Power value to avoid blackouts during Gravity Generator charging sequence and extensive power use is 11 kW.
+</Document>
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Skipper.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Skipper.xml
new file mode 100644
index 00000000000..b77969d7bc1
--- /dev/null
+++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Skipper.xml
@@ -0,0 +1,78 @@
+<Document>
+  # SKIPPER-CLASS SERVICE SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="hydroponicsTrayAnchored"/>
+  <GuideEntityEmbed Entity="KitchenMicrowave"/>
+  <GuideEntityEmbed Entity="KitchenDeepFryer"/>
+  <GuideEntityEmbed Entity="KitchenElectricGrill"/>
+  </Box>
+  <Box>
+  <GuideEntityEmbed Entity="ShuttleMapSkipper" Caption=""/>
+  </Box>
+  [color=#a4885c]Ship Size:[/color] Small
+
+  [color=#a4885c]Recommended Crew:[/color] 2-3
+
+  [color=#a4885c]Power Gen Type:[/color] Plasma
+
+  [color=#a4885c]Expeditions:[/color] None
+
+  [color=#a4885c]IFF Console:[/color] None
+
+  "A small service ship with a full service kitchen and hydroponics garden."
+
+  # PREFLIGHT CHECKLIST
+
+  ## 1. Power supply
+  
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SubstationWallBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+  
+  - Check that the substation unit is anchored to the floor.
+  - Check that the APC unit's Main Breaker is toggled on.
+  - Check the APC unit's current Load* (W).
+
+  ## 1.2. P.A.C.M.A.N. generator unit
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorPacmanShuttle"/>
+  <GuideEntityEmbed Entity="SheetPlasma"/>
+  </Box>
+  
+  - Check that the P.A.C.M.A.N. generator units are anchored to the floor.
+  - Check that the P.A.C.M.A.N. generator units have fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+  - Check that the P.A.C.M.A.N. generator units are set to HV output.
+  - Set Target Power to 8-9** [bold]kW[/bold].
+  - Start the P.A.C.M.A.N. generator units.
+
+  ## 2. Atmospherics
+
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="OxygenCanister"/>
+  <GuideEntityEmbed Entity="NitrogenCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  <GuideEntityEmbed Entity="GasMixer"/>
+  </Box>
+
+  - Check if the O2 canister and N2 canister are anchored to their connector ports.
+  - Check if the gas mixer has its mixing ratio and output pressure set correctly.
+  - Enable the gas mixer.
+
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="Gyroscope"/>
+  <GuideEntityEmbed Entity="GravityGeneratorMini"/>
+  </Box>
+
+  - Check that the gyroscope is anchored, powered, and enabled.
+  - Check that the mini gravity generator is anchored, powered, and enabled.
+
+  ## Sidenotes
+
+  * - Skipper-class service ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption. One can check the ship's total power consumption against the P.A.C.M.A.N. generator units Target Power output: to keep substation and APCs fully charged, P.A.C.M.A.N. generator unit Target Power output should exceed the combined load of all APCs. Remember to check APC Loads and adjust the generator unit Target Power after connecting new power-consuming machines. The average combined load of all APCs on a stock model Skipper-class ship is 16'000W when idle.
+
+  ** - Skipper-class service ships have low power demand meaning that the P.A.C.M.A.N. generator unit's Target Power value can be lowered as low as 8 kW. Please note, that recommended Target Power value to avoid blackouts during Gravity Generator charging sequence and extensive power use is 9 kW.
+</Document>
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml
new file mode 100644
index 00000000000..c090d141a46
--- /dev/null
+++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml
@@ -0,0 +1,94 @@
+<Document>
+  # SPARROW-CLASS RESEARCH SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="VariedXenoArtifactItem"/>
+  <GuideEntityEmbed Entity="MachineArtifactAnalyzer"/>
+  <GuideEntityEmbed Entity="ComputerTabletopAnalysisConsole"/>
+  <GuideEntityEmbed Entity="ResearchAndDevelopmentServer"/>
+  <GuideEntityEmbed Entity="TechnologyDisk" Caption="tech disk"/>
+  </Box>
+  <Box>
+  <GuideEntityEmbed Entity="ShuttleMapSparrow" Caption=""/>
+  </Box>
+    [color=#a4885c]Ship Size:[/color] Small
+	
+	[color=#a4885c]Recommended Crew:[/color] 1-2
+	
+	[color=#a4885c]Power Gen Type:[/color] Plasma
+	
+	[color=#a4885c]Expeditions:[/color] None
+	
+	[color=#a4885c]IFF Console:[/color] None
+	
+  "A small research and engineering vessel."
+    
+  # PREFLIGHT CHECKLIST
+  
+  ## 1. Power supply
+  
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SMESBasic"/>
+  <GuideEntityEmbed Entity="SubstationBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+  
+  - Check that the SMES unit is anchored to the floor.
+  - Check that the substation unit is anchored to the floor.
+  - Check that the APC unit's Main Breaker is toggled on.
+  - Check the APC unit's current Load* (W).
+  
+  ## 1.2. P.A.C.M.A.N. generator units
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorPacmanShuttle"/>
+  <GuideEntityEmbed Entity="SheetPlasma"/>
+  </Box>
+  
+  - Check that the P.A.C.M.A.N. generator units are anchored to the floor.
+  - Check that the P.A.C.M.A.N. generator units have fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+  - Check that the P.A.C.M.A.N. generator units are set to HV output.
+  - Set Target Power for 19** [bold]kW[/bold].
+  - Ensure that the P.A.C.M.A.N. generator units are enabled.
+  
+  ## 2. Atmospherics
+  
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="OxygenCanister"/>
+  <GuideEntityEmbed Entity="NitrogenCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  <GuideEntityEmbed Entity="GasMixer"/>
+  </Box>
+  
+  - Check that the O2 canister is anchored to connector port.
+  - Check that the N2 canister is anchored to connector port.
+  - Check that the gas mixer is set to the correct mixing ratio (21% Oxygen, 79% Nitrogen).
+  - Check that the gas mixer is set to 101kPa.
+  - Ensure that the gas mixer is enabled.
+  
+  ## 2.2. Waste Loop
+  <Box>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  <GuideEntityEmbed Entity="AirAlarm"/>
+  </Box>
+    
+  - Ensure that the waste loop pump is enabled.
+  - Disable Auto Mode on any Air Alarms.
+  - Set the Air Alarms to Filtering (Wide).
+  
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="Gyroscope"/>
+  <GuideEntityEmbed Entity="GravityGeneratorMini"/>
+  </Box>
+  
+  - Check that the gyroscope is anchored, powered, and enabled.
+  - Check that the mini gravity generator is anchored, powered, and enabled.
+  
+  ## Sidenotes
+  
+  * - Sparrow-class research ships are equipped with two APC units that can be used to appraise the ship's total power consumption. An unmodified Sparrow-class ship requires 36.1 kW of power to remain operational.
+  
+  ** - Sparrow-class research ships have higher power demand than standard P.A.C.M.A.N. generator units can provide at optimal settings. Unanchoring the artifact analyzer when not used will allow for the generator units to be set to as low as 13 kW.
+
+</Document>
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/honker.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/honker.png
new file mode 100644
index 00000000000..1e28c20f6a8
Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/honker.png differ
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
index 240a6812db6..ec8a469ab3a 100644
--- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
+++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi. spirit by iNoahGuy/actualcatmoment (discord/github). apothecary, stasis by dustylens (discord/github). barge, hauler by Mygnol (discord/github)",
+  "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi. spirit by iNoahGuy/actualcatmoment (discord/github). apothecary, stasis by dustylens (discord/github). barge, hauler, placebo, skipper, sparrow by Mygnol (discord/github)",
   "size": {
     "x": 128,
     "y": 96
@@ -52,6 +52,9 @@
     {
       "name": "hauler"
     },
+    {
+      "name": "honker"
+    },
     {
       "name": "investigator"
     },
@@ -79,12 +82,21 @@
     {
       "name": "pioneer"
     },
+    {
+      "name": "placebo"
+    },
     {
       "name": "prospector"
     },
     {
       "name": "searchlight"
     },
+    {
+      "name": "sparrow"
+    },
+    {
+      "name": "skipper"
+    },
     {
       "name": "spirit"
     },
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/placebo.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/placebo.png
new file mode 100644
index 00000000000..cc86a38e339
Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/placebo.png differ
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/skipper.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/skipper.png
new file mode 100644
index 00000000000..7cfad9d6ce4
Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/skipper.png differ
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/sparrow.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/sparrow.png
new file mode 100644
index 00000000000..8fd0750c8f4
Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/sparrow.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-blinky-unlit.png b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-blinky-unlit.png
new file mode 100644
index 00000000000..181f93951cd
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-blinky-unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-broken-unlit.png b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-broken-unlit.png
new file mode 100644
index 00000000000..bb07c82289a
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-broken-unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-invisible.png b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-invisible.png
new file mode 100644
index 00000000000..016d8ba5a76
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-invisible.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-on-unlit.png b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-on-unlit.png
new file mode 100644
index 00000000000..16ad6f08cca
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-on-unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-running-unlit.png b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-running-unlit.png
new file mode 100644
index 00000000000..6fee84d722e
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-running-unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-scan-unlit.png b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-scan-unlit.png
new file mode 100644
index 00000000000..e8602d6233c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-scan-unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler.png b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler.png
new file mode 100644
index 00000000000..baffc10136c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/meta.json
new file mode 100644
index 00000000000..414903fc282
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/meta.json
@@ -0,0 +1,56 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Paradise at commit https://github.com/ParadiseSS13/Paradise/commit/bd91a1b962fe9bd38e346e9fafd4ebb10784fcb3. | Edited by Whatstone (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "assembler"
+        },
+        {
+            "name": "assembler-blinky-unlit",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "assembler-broken-unlit"
+        },
+        {
+            "name": "assembler-invisible"
+        },
+        {
+            "name": "assembler-on-unlit"
+        },
+        {
+            "name": "assembler-running-unlit"
+        },
+        {
+            "name": "assembler-scan-unlit",
+            "delays": [
+                    [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.4
+                ]
+            ]
+        }
+    ]
+}
+  
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/icon.png b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/icon.png
new file mode 100644
index 00000000000..7c25a431303
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-base.png b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-base.png
new file mode 100644
index 00000000000..f66a2ea5aab
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-base.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-off-unlit.png b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-off-unlit.png
new file mode 100644
index 00000000000..6c105c1b9ce
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-off-unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-on-unlit.png b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-on-unlit.png
new file mode 100644
index 00000000000..d6795963d4f
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-on-unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/meta.json
new file mode 100644
index 00000000000..fdcaa1dd5c6
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from chemmaster.dmi from NebulaSS13 at https://github.com/NebulaSS13/Nebula/commit/413dc17c9757bf33984534a4d9b3e3db538a6285 by Whatstone (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "mediwave-base"
+        },
+        {
+            "name": "mediwave-off-unlit"
+        },
+        {
+            "name": "mediwave-on-unlit"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_off.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_off.png
new file mode 100644
index 00000000000..8715e4cd1f0
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_off.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_on.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_on.png
new file mode 100644
index 00000000000..e9db9b1ec75
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_on.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/cooking_unlit.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/cooking_unlit.png
new file mode 100644
index 00000000000..b87f8f1558c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven.rsi/cooking_unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/oven.rsi/meta.json
new file mode 100644
index 00000000000..cbf727e9d1e
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Machines/oven.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b6b3fcaa19a1f8c78ac6e8b158b59cfb618bf0f9",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "composite_off"
+        },
+        {
+            "name": "composite_on"
+        },
+        {
+            "name": "cooking_unlit"
+        },
+        {
+            "name": "off_no_door"
+        },
+        {
+            "name": "oven_door"
+        },
+        {
+            "name": "range_high"
+        },
+        {
+            "name": "range_low"
+        },
+        {
+            "name": "range_medium"
+        },
+        {
+            "name": "unlit"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/off_no_door.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/off_no_door.png
new file mode 100644
index 00000000000..8804d40e833
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven.rsi/off_no_door.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/oven_door.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/oven_door.png
new file mode 100644
index 00000000000..62c6b74fe24
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven.rsi/oven_door.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_high.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_high.png
new file mode 100644
index 00000000000..1527a4efe77
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_high.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_low.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_low.png
new file mode 100644
index 00000000000..bf1068ec77f
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_low.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_medium.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_medium.png
new file mode 100644
index 00000000000..52f2aa0d0ef
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_medium.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/unlit.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/unlit.png
new file mode 100644
index 00000000000..089bd05aeeb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven.rsi/unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_off.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_off.png
new file mode 100644
index 00000000000..c3dd85a50fa
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_off.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_on.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_on.png
new file mode 100644
index 00000000000..838bd1456a5
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_on.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/cooking_unlit.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/cooking_unlit.png
new file mode 100644
index 00000000000..b87f8f1558c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/cooking_unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/meta.json
new file mode 100644
index 00000000000..cbf727e9d1e
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/meta.json
@@ -0,0 +1,38 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b6b3fcaa19a1f8c78ac6e8b158b59cfb618bf0f9",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "composite_off"
+        },
+        {
+            "name": "composite_on"
+        },
+        {
+            "name": "cooking_unlit"
+        },
+        {
+            "name": "off_no_door"
+        },
+        {
+            "name": "oven_door"
+        },
+        {
+            "name": "range_high"
+        },
+        {
+            "name": "range_low"
+        },
+        {
+            "name": "range_medium"
+        },
+        {
+            "name": "unlit"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/off_no_door.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/off_no_door.png
new file mode 100644
index 00000000000..91241aec1f1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/off_no_door.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/oven_door.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/oven_door.png
new file mode 100644
index 00000000000..62c6b74fe24
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/oven_door.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_high.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_high.png
new file mode 100644
index 00000000000..1527a4efe77
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_high.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_low.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_low.png
new file mode 100644
index 00000000000..bf1068ec77f
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_low.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_medium.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_medium.png
new file mode 100644
index 00000000000..52f2aa0d0ef
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_medium.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/unlit.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/unlit.png
new file mode 100644
index 00000000000..089bd05aeeb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/unlit.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json
rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/meta.json
diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/normal.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/normal.png
similarity index 100%
rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/normal.png
rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/normal.png
diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/off.png
similarity index 100%
rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/off.png
rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/off.png
diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-empty.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-empty.png
similarity index 100%
rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-empty.png
rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-empty.png
diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-money.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-money.png
similarity index 100%
rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-money.png
rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-money.png
diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-paper.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-paper.png
similarity index 100%
rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-paper.png
rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-paper.png