diff --git a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs b/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs
index e5379847448..9365d8fe94c 100644
--- a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs
+++ b/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs
@@ -51,6 +51,7 @@ private void Populate(List<string> availablePrototypes, List<string> unavailable
         _menu.PopulateProducts(availablePrototypes, unavailablePrototypes, freeListings, validId);
         _menu.PopulateCategories(availablePrototypes, unavailablePrototypes);
         _menu.PopulateClasses(availablePrototypes, unavailablePrototypes);
+        _menu.PopulateEngines(availablePrototypes, unavailablePrototypes);
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml
index c5e8a23d3ef..2bde8483a30 100644
--- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml
+++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml
@@ -1,8 +1,8 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                           SetSize="600 500"
-                           MinSize="600 300">
+                           SetSize="640 500"
+                           MinSize="640 300">
     <BoxContainer Orientation="Vertical" Margin="5 0 5 0">
         <BoxContainer Orientation="Vertical">
             <BoxContainer Orientation="Horizontal">
@@ -32,6 +32,9 @@
             <OptionButton Name="Classes"
                           Prefix="{Loc 'shipyard-console-menu-class-label'}"
                           HorizontalExpand="True" />
+            <OptionButton Name="Engines"
+                          Prefix="{Loc 'shipyard-console-menu-engine-label'}"
+                          HorizontalExpand="True" />
         </BoxContainer>
         <ScrollContainer HorizontalExpand="True"
                          VerticalExpand="True"
diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
index 9687ae3f081..8322279d0d4 100644
--- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
+++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
@@ -22,8 +22,10 @@ public sealed partial class ShipyardConsoleMenu : FancyWindow
     private readonly ShipyardConsoleBoundUserInterface _menu;
     private readonly List<VesselSize> _categoryStrings = new();
     private readonly List<VesselClass> _classStrings = new();
+    private readonly List<VesselEngine> _engineStrings = new();
     private VesselSize? _category;
     private VesselClass? _class;
+    private VesselEngine? _engine;
 
     private List<string> _lastAvailableProtos = new();
     private List<string> _lastUnavailableProtos = new();
@@ -39,6 +41,7 @@ public ShipyardConsoleMenu(ShipyardConsoleBoundUserInterface owner)
         SearchBar.OnTextChanged += OnSearchBarTextChanged;
         Categories.OnItemSelected += OnCategoryItemSelected;
         Classes.OnItemSelected += OnClassItemSelected;
+        Engines.OnItemSelected += OnEngineItemSelected;
         SellShipButton.OnPressed += (args) => { OnSellShip?.Invoke(args); };
     }
 
@@ -55,6 +58,12 @@ private void OnClassItemSelected(OptionButton.ItemSelectedEventArgs args)
         PopulateProducts(_lastAvailableProtos, _lastUnavailableProtos, _freeListings, _validId);
     }
 
+    private void OnEngineItemSelected(OptionButton.ItemSelectedEventArgs args)
+    {
+        SetEngineText(args.Id);
+        PopulateProducts(_lastAvailableProtos, _lastUnavailableProtos, _freeListings, _validId);
+    }
+
     private void OnSearchBarTextChanged(LineEdit.LineEditEventArgs args)
     {
         PopulateProducts(_lastAvailableProtos, _lastUnavailableProtos, _freeListings, _validId);
@@ -70,6 +79,11 @@ private void SetClassText(int id)
         _class = id == 0 ? null : _classStrings[id];
         Classes.SelectId(id);
     }
+    private void SetEngineText(int id)
+    {
+        _engine = id == 0 ? null : _engineStrings[id];
+        Engines.SelectId(id);
+    }
     /// <summary>
     ///     Populates the list of products that will actually be shown, using the current filters.
     /// </summary>
@@ -115,6 +129,8 @@ private void AddVesselsToControls(IEnumerable<VesselPrototype?> vessels, string
                 continue;
             if (_class != null && !prototype!.Classes.Contains(_class.Value))
                 continue;
+            if (_engine != null && !prototype!.Engines.Contains(_engine.Value))
+                continue;
             if (search.Length > 0 && !prototype!.Name.ToLowerInvariant().Contains(search))
                 continue;
 
@@ -176,6 +192,9 @@ private void AddCategoriesFromPrototypes(IEnumerable<string> prototypes)
         }
     }
 
+    /// <summary>
+    ///     Populates the list classes that will actually be shown, using the current filters.
+    /// </summary>
     public void PopulateClasses(List<string> availablePrototypes, List<string> unavailablePrototypes)
     {
         _classStrings.Clear();
@@ -215,6 +234,48 @@ private void AddClassesFromPrototypes(IEnumerable<string> prototypes)
         }
     }
 
+    /// <summary>
+    ///     Populates the list engines that will actually be shown, using the current filters.
+    /// </summary>
+    public void PopulateEngines(List<string> availablePrototypes, List<string> unavailablePrototypes)
+    {
+        _engineStrings.Clear();
+        Engines.Clear();
+
+        AddEnginesFromPrototypes(availablePrototypes);
+        AddEnginesFromPrototypes(unavailablePrototypes);
+
+        _engineStrings.Sort();
+
+        // Add "All" category at the top of the list
+        _engineStrings.Insert(0, VesselEngine.All);
+
+        foreach (var str in _engineStrings)
+        {
+            Engines.AddItem(Loc.GetString($"shipyard-console-engine-{str}"));
+        }
+    }
+
+    /// <summary>
+    /// Adds all ship engine power type from a list of vessel prototypes to the current control's list if they are missing.
+    /// </summary>
+    private void AddEnginesFromPrototypes(IEnumerable<string> prototypes)
+    {
+        foreach (var protoId in prototypes)
+        {
+            if (!_protoManager.TryIndex<VesselPrototype>(protoId, out var prototype))
+                continue;
+
+            foreach (var cl in prototype.Engines)
+            {
+                if (!_engineStrings.Contains(cl) && cl != VesselEngine.All)
+                {
+                    _engineStrings.Add(cl);
+                }
+            }
+        }
+    }
+
     public void UpdateState(ShipyardConsoleInterfaceState state)
     {
         BalanceLabel.Text = BankSystemExtensions.ToSpesoString(state.Balance);
diff --git a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs b/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs
index e10e8afe606..f7e50b78b05 100644
--- a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs
+++ b/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs
@@ -29,23 +29,29 @@ public sealed class VesselPrototype : IPrototype
     public int Price;
 
     /// <summary>
-    ///     The category of the product. (e.g. Small, Medium, Large, Emergency, Special etc.)
+    ///     The size of the vessel. (e.g. Small, Medium, Large etc.)
     /// </summary>
     [DataField("category", required: true)]
     public VesselSize Category = VesselSize.Small;
 
     /// <summary>
-    ///     The group of the product. (e.g. Civilian, Syndicate, Contraband etc.)
+    ///     The shipyard listing that the vessel should be in. (e.g. Civilian, Syndicate, Contraband etc.)
     /// </summary>
     [DataField("group", required: true)]
     public ShipyardConsoleUiKey Group = ShipyardConsoleUiKey.Shipyard;
 
     /// <summary>
-    ///     The group of the product. (e.g. Civilian, Syndicate, Contraband etc.)
+    ///     The purpose of the vessel. (e.g. Service, Cargo, Engineering etc.)
     /// </summary>
     [DataField("class")]
     public List<VesselClass> Classes = new();
 
+    /// <summary>
+    ///     The engine type that powers the vessel. (e.g. AME, Plasma, Solar etc.)
+    /// </summary>
+    [DataField("engine")]
+    public List<VesselEngine> Engines = new();
+
     /// <summary>
     ///     The access required to buy the product. (e.g. Command, Mail, Bailiff, etc.)
     /// </summary>
@@ -96,6 +102,13 @@ public enum VesselSize : byte
 public enum VesselClass : byte
 {
     All, // Should not be used by ships, intended as a placeholder value to represent everything
+    // NFSD-specific categories
+    Capital,
+    Detainment,
+    Detective,
+    Fighter,
+    Patrol,
+    Pursuit,
     // Capabilities
     Expedition,
     Scrapyard,
@@ -114,11 +127,21 @@ public enum VesselClass : byte
     // Antag ships
     Syndicate,
     Pirate,
-    // NFSD-specific categories
-    Detainment,
-    Detective,
-    Fighter,
-    Stealth,
-    Capital,
 }
 
+public enum VesselEngine : byte
+{
+    All, // Should not be used by ships, intended as a placeholder value to represent everything
+    AME,
+    TEG,
+    Supermatter,
+    Tesla,
+    Singularity,
+    Solar,
+    RTG,
+    APU,
+    Welding,
+    Plasma,
+    Uranium,
+    Bananium,
+}
diff --git a/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl b/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl
index f2d0a8bd96d..7965f0c2394 100644
--- a/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl
+++ b/Resources/Locale/en-US/_NF/shipyard/shipyard-console-component.ftl
@@ -29,6 +29,7 @@ shipyard-console-dangerous-materials = Dangerous materials detected onboard.
 
 shipyard-console-menu-size-label = Size:{" "}
 shipyard-console-menu-class-label = Class:{" "}
+shipyard-console-menu-engine-label = Engine:{" "}
 
 shipyard-console-purchase-available = Purchase
 shipyard-console-guidebook = Manual
@@ -53,10 +54,27 @@ shipyard-console-class-Atmospherics = Atmospherics
 shipyard-console-class-Medical = Medical
 shipyard-console-class-Civilian = Civilian
 shipyard-console-class-Kitchen = Kitchen
+# Antag
 shipyard-console-class-Syndicate = Syndicate
 shipyard-console-class-Pirate = Pirate
+# NFSD
+shipyard-console-class-Capital = Capital
 shipyard-console-class-Detainment = Detainment
 shipyard-console-class-Detective = Detective
 shipyard-console-class-Fighter = Fighter
-shipyard-console-class-Stealth = Stealth
-shipyard-console-class-Capital = Capital
+shipyard-console-class-Patrol = Patrol
+shipyard-console-class-Pursuit = Pursuit
+
+shipyard-console-engine-All = All
+shipyard-console-engine-AME = AME
+shipyard-console-engine-TEG = TEG
+shipyard-console-engine-Supermatter = Supermatter
+shipyard-console-engine-Tesla = Tesla
+shipyard-console-engine-Singularity = Singularity
+shipyard-console-engine-Solar = Solar
+shipyard-console-engine-RTG = RTG
+shipyard-console-engine-APU = APU
+shipyard-console-engine-Welding = Welding Fuel
+shipyard-console-engine-Plasma = Plasma
+shipyard-console-engine-Uranium = Uranium
+shipyard-console-engine-Bananium = Bananium
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml
index a6e0efe08c8..a007ae628ff 100644
--- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml
+++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml
@@ -14,6 +14,8 @@
   guidebookPage: Null
   class:
   - Pirate
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Barnacle
diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml
index 2f7f8128f66..96715fd810d 100644
--- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml
@@ -19,6 +19,8 @@
   guidebookPage: Null
   class:
   - Pirate
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Bocakillo
diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml
index b8e8149f9da..3f94499b370 100644
--- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml
+++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml
@@ -14,6 +14,8 @@
   guidebookPage: Null
   class:
   - Pirate
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Falcon
diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml
index 1cf39ed4c07..f4e2d9ef6d6 100644
--- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml
+++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml
@@ -19,6 +19,8 @@
   guidebookPage: Null
   class:
   - Pirate
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Menace
diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml
index 3bd36db5cb0..a3c4a49c4f9 100644
--- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml
+++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml
@@ -9,6 +9,8 @@
   guidebookPage: Null
   class:
   - Pirate
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Schooner
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml
index 6dfab3faef2..3bdd13cc86b 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml
@@ -20,6 +20,8 @@
   class:
   - Expedition
   - Atmospherics
+  engine:
+  - AME
 
 - type: gameMap
   id: Ambition
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
index 66ad1510d1c..2063e7ce822 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
@@ -20,6 +20,8 @@
   class:
   - Expedition
   - Civilian
+  engine:
+  - AME
 
 - type: gameMap
   id: Anchor
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml
index 0da6fa50887..859a9eac57c 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml
@@ -19,7 +19,9 @@
   guidebookPage: ShipyardBrigand
   class:
   - Expedition
-  
+  engine:
+  - AME
+
 - type: gameMap
   id: Brigand
   mapName: 'Brigand'
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml
index 10e9cff6aef..a3d21261f9c 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml
@@ -19,6 +19,8 @@
   guidebookPage: Null
   class:
   - Expedition
+  engine:
+  - AME
 
 - type: gameMap
   id: DecadeDove
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml
index 2319e98f3e1..04f41d86ad9 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml
@@ -19,6 +19,8 @@
   guidebookPage: Null
   class:
   - Expedition
+  engine:
+  - AME
 
 - type: gameMap
   id: Dragonfly
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml
index de8fcd5f92f..e3bff648d33 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml
@@ -20,6 +20,8 @@
   class:
   - Expedition
   - Atmospherics
+  engine:
+  - AME
 
 - type: gameMap
   id: Gasbender
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml
index 8c4bd334c0c..d49502c123e 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml
@@ -21,6 +21,8 @@
   - Expedition
   - Science
   - Civilian
+  engine:
+  - AME
 
 - type: gameMap
   id: Gourd
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml
index 3271fbbfaba..9e6c0438428 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml
@@ -19,7 +19,9 @@
   guidebookPage: ShipyardPathfinder
   class:
   - Expedition
-  
+  engine:
+  - AME
+
 - type: gameMap
   id: Pathfinder
   mapName: 'KC Pathfinder'
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
index fc1117d8511..d7f762575c5 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
@@ -19,6 +19,8 @@
   guidebookPage: Null
   class:
   - Expedition
+  engine:
+  - AME
 
 - type: gameMap
   id: Sprinter
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml
index 0f39fb0ea03..5360a29ab7e 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml
@@ -20,6 +20,8 @@
   guidebookPage: Null
   class:
   - Detective
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Broadhead
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
index 74e54020a96..c174c1ddedb 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
@@ -11,6 +11,8 @@
   guidebookPage: Null
   class:
   - Medical
+  engine:
+  - APU
 
 - type: gameMap
   id: Cleric
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
index 2705b1a55b9..e7cc245ed47 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
@@ -10,6 +10,8 @@
   guidebookPage: Null
   class:
   - Capital
+  engine:
+  - AME
 
 - type: gameMap
   id: Empress
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
index b0822ce578d..e1aca8b0493 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
@@ -11,6 +11,8 @@
   guidebookPage: Null
   class:
   - Fighter
+  engine:
+  - APU
 
 - type: gameMap
   id: Fighter
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
index e6e1b72e11a..d232622e42c 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
@@ -10,6 +10,8 @@
   guidebookPage: Null
   class:
   - Medical
+  engine:
+  - APU
 
 - type: gameMap
   id: Hospitaller
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
index e949496cb77..68b03e1dea2 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
@@ -10,6 +10,8 @@
   guidebookPage: Null
   class:
   - Detective
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Interceptor
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
index eb9f6457b82..1fdf9381684 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
@@ -9,7 +9,9 @@
   shuttlePath: /Maps/_NF/Shuttles/Nfsd/prowler.yml
   guidebookPage: Null
   class:
-  - Stealth
+  - Patrol
+  engine:
+  - AME
 
 - type: gameMap
   id: Prowler
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
index 10841e5604c..b50c6de86e9 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
@@ -11,6 +11,8 @@
   guidebookPage: Null
   class:
   - Fighter
+  engine:
+  - APU
 
 - type: gameMap
   id: Rogue
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
index 892d8d0b4cc..d5d747b852a 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
@@ -9,7 +9,9 @@
   shuttlePath: /Maps/_NF/Shuttles/Nfsd/templar.yml
   guidebookPage: Null
   class:
-  - Fighter
+  - Pursuit
+  engine:
+  - APU
 
 - type: gameMap
   id: Templar
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
index 200403ff010..f97a0f24225 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
@@ -12,6 +12,8 @@
   - Capital
   - Detainment
   - Expedition
+  engine:
+  - AME
 
 - type: gameMap
   id: Wasp
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml
index ccb1fe6c529..c5f3891e944 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml
@@ -17,6 +17,10 @@
   group: Security
   access: Sergeant
   shuttlePath: /Maps/_NF/Shuttles/Nfsd/wendigo.yml
+  class:
+  - Pursuit
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Wendigo
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml
index 6997a17be55..90ebb55ed76 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml
@@ -11,6 +11,8 @@
   - Scrapyard
   - Salvage
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Bison
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml
index c5c3c89f907..fae2fae78d4 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml
@@ -14,6 +14,8 @@
   class:
   - Scrapyard
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Canister
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml
index ca34fce2c05..18f6ea58ce8 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml
@@ -20,6 +20,8 @@
   class:
   - Scrapyard
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Disciple
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml
index ed3e4b7a08b..393428c0bbb 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml
@@ -20,6 +20,8 @@
   class:
   - Scrapyard
   - Kitchen
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Nugget
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
index c96e0bd6946..6fbc5643db7 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
@@ -11,6 +11,8 @@
   - Scrapyard
   - Cargo
   - Salvage
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Orange
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml
index 8999e9ef80c..77db60eb817 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml
@@ -10,6 +10,8 @@
   class:
   - Scrapyard
   - Science
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Point
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
index d422d608832..79d11ec2bea 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
@@ -10,6 +10,8 @@
   class:
   - Scrapyard
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Tide
diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml
index 4b704dd3b58..21855a3c582 100644
--- a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml
@@ -20,6 +20,8 @@
   guidebookPage: Null
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Bottleneck
diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml
index 3aa7110c837..6a50123efdf 100644
--- a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml
@@ -20,6 +20,8 @@
   guidebookPage: Null
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Broom
diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml
index 0850b7c93e8..2a93881747b 100644
--- a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml
@@ -21,6 +21,8 @@
   guidebookPage: Null
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Chauffeur
diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml
index 73b49a74abf..ad8a315c71e 100644
--- a/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml
@@ -20,6 +20,8 @@
   guidebookPage: Null
   class:
   - Cargo
+  engine:
+  - Plasma
 
 - type: gameMap
   id: MailPod
diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml
index 82ed7437d2b..c1fcec87c8d 100644
--- a/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml
@@ -20,6 +20,8 @@
   guidebookPage: Null
   class:
   - Cargo
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Parcel
diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml
index d4f8ea6944e..95ad653cb87 100644
--- a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml
@@ -21,6 +21,8 @@
   guidebookPage: Null
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Watchdog
diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml
index 198edc34089..e52c03a387c 100644
--- a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml
@@ -9,6 +9,8 @@
   guidebookPage: Null
   class:
   - Syndicate
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Hunter
diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml
index 2e523699f9f..7b9d70685b2 100644
--- a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml
@@ -9,6 +9,8 @@
   guidebookPage: Null
   class:
   - Syndicate
+  engine:
+  - AME
 
 - type: gameMap
   id: Infiltrator
diff --git a/Resources/Prototypes/_NF/Shipyard/akupara.yml b/Resources/Prototypes/_NF/Shipyard/akupara.yml
index d12e7afabb8..206b3d9bea3 100644
--- a/Resources/Prototypes/_NF/Shipyard/akupara.yml
+++ b/Resources/Prototypes/_NF/Shipyard/akupara.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardAkupara
   class:
   - Botany
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Akupara
diff --git a/Resources/Prototypes/_NF/Shipyard/apothecary.yml b/Resources/Prototypes/_NF/Shipyard/apothecary.yml
index bdae62e6c69..a99db4b8f1a 100644
--- a/Resources/Prototypes/_NF/Shipyard/apothecary.yml
+++ b/Resources/Prototypes/_NF/Shipyard/apothecary.yml
@@ -20,6 +20,8 @@
   class:
   - Medical
   - Chemistry
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Apothecary
diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml
index 9494e3ab19f..ed9315f79f3 100644
--- a/Resources/Prototypes/_NF/Shipyard/barge.yml
+++ b/Resources/Prototypes/_NF/Shipyard/barge.yml
@@ -20,6 +20,9 @@
   class:
   - Cargo
   - Salvage
+  engine:
+  - Solar
+  - Plasma
 
 - type: gameMap
   id: Barge
diff --git a/Resources/Prototypes/_NF/Shipyard/bazaar.yml b/Resources/Prototypes/_NF/Shipyard/bazaar.yml
index 151978184bb..79ca186a112 100644
--- a/Resources/Prototypes/_NF/Shipyard/bazaar.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bazaar.yml
@@ -20,7 +20,9 @@
   class:
   - Cargo
   - Civilian
-  
+  engine:
+  - Uranium
+
 - type: gameMap
   id: Bazaar
   mapName: 'SLI Bazaar'
diff --git a/Resources/Prototypes/_NF/Shipyard/beaker.yml b/Resources/Prototypes/_NF/Shipyard/beaker.yml
index 7e112db4312..59a6429ddb9 100644
--- a/Resources/Prototypes/_NF/Shipyard/beaker.yml
+++ b/Resources/Prototypes/_NF/Shipyard/beaker.yml
@@ -9,6 +9,8 @@
   guidebookPage: Null
   class:
   - Chemistry
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Beaker
diff --git a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml
index ddf2014ffae..bbd4b06b2f7 100644
--- a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardBocadillo
   class:
   - Kitchen
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Bocadillo
diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml
index d23343683a5..71d95ce3d1a 100644
--- a/Resources/Prototypes/_NF/Shipyard/bookworm.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bookworm.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardBookworm
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Bookworm
diff --git a/Resources/Prototypes/_NF/Shipyard/bulker.yml b/Resources/Prototypes/_NF/Shipyard/bulker.yml
index 3e06415b043..62a6b5f7547 100644
--- a/Resources/Prototypes/_NF/Shipyard/bulker.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bulker.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardBulker
   class:
   - Salvage
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Bulker
diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml
index 83f2f5a381c..9632fb6d5e6 100644
--- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml
+++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml
@@ -10,6 +10,8 @@
   class:
   - Medical
   - Chemistry
+  engine:
+  - AME
 
 - type: gameMap
   id: Caduceus
diff --git a/Resources/Prototypes/_NF/Shipyard/camper.yml b/Resources/Prototypes/_NF/Shipyard/camper.yml
index 8c3d45770c1..b518df80835 100644
--- a/Resources/Prototypes/_NF/Shipyard/camper.yml
+++ b/Resources/Prototypes/_NF/Shipyard/camper.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardCamper
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Camper
diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml
index c726475ca83..bfa4888967f 100644
--- a/Resources/Prototypes/_NF/Shipyard/ceres.yml
+++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardCeres
   class:
   - Kitchen
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Ceres
diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml
index 9dcb533f0f9..6a802679211 100644
--- a/Resources/Prototypes/_NF/Shipyard/chisel.yml
+++ b/Resources/Prototypes/_NF/Shipyard/chisel.yml
@@ -20,6 +20,8 @@
   class:
   - Salvage
   - Cargo #???
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Chisel
diff --git a/Resources/Prototypes/_NF/Shipyard/comet.yml b/Resources/Prototypes/_NF/Shipyard/comet.yml
index a18a284a6e6..0efea12ba1a 100644
--- a/Resources/Prototypes/_NF/Shipyard/comet.yml
+++ b/Resources/Prototypes/_NF/Shipyard/comet.yml
@@ -20,6 +20,8 @@
   class:
   - Salvage
   - Engineering
+  engine:
+  - AME
 
 - type: gameMap
   id: Comet
diff --git a/Resources/Prototypes/_NF/Shipyard/construct.yml b/Resources/Prototypes/_NF/Shipyard/construct.yml
index 7549e418113..c2973bd6756 100644
--- a/Resources/Prototypes/_NF/Shipyard/construct.yml
+++ b/Resources/Prototypes/_NF/Shipyard/construct.yml
@@ -9,6 +9,8 @@
   guidebookPage: ShipyardConstruct
   class:
   - Engineering
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Construct
diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml
index 3c1dfd6eb2f..8a1ceede607 100644
--- a/Resources/Prototypes/_NF/Shipyard/crescent.yml
+++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml
@@ -21,6 +21,8 @@
   - Science
   - Chemistry
   - Civilian
+  engine:
+  - AME
 
 - type: gameMap
   id: Crescent
diff --git a/Resources/Prototypes/_NF/Shipyard/eagle.yml b/Resources/Prototypes/_NF/Shipyard/eagle.yml
index 06c2fa63ec4..890d74ed474 100644
--- a/Resources/Prototypes/_NF/Shipyard/eagle.yml
+++ b/Resources/Prototypes/_NF/Shipyard/eagle.yml
@@ -20,6 +20,8 @@
   class:
   - Medical
   - Engineering
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Eagle
diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml
index a8be30f7588..df4ae3d0d00 100644
--- a/Resources/Prototypes/_NF/Shipyard/garden.yml
+++ b/Resources/Prototypes/_NF/Shipyard/garden.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardGarden
   class:
   - Botany
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Garden
diff --git a/Resources/Prototypes/_NF/Shipyard/hammer.yml b/Resources/Prototypes/_NF/Shipyard/hammer.yml
index 330d82c7c21..0e15d9c4d7c 100644
--- a/Resources/Prototypes/_NF/Shipyard/hammer.yml
+++ b/Resources/Prototypes/_NF/Shipyard/hammer.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardHammer
   class:
   - Engineering
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Hammer
diff --git a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml
index 3bda17111ac..53bff19c5af 100644
--- a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml
+++ b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardHarbormaster
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Harbormaster
diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml
index 00a46ea0745..2161b812fc5 100644
--- a/Resources/Prototypes/_NF/Shipyard/hauler.yml
+++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml
@@ -10,6 +10,8 @@
   class:
   - Cargo
   - Salvage
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Hauler
diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml
index c2d2ec4342c..3c0cc24f75d 100644
--- a/Resources/Prototypes/_NF/Shipyard/honker.yml
+++ b/Resources/Prototypes/_NF/Shipyard/honker.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardHonker
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Honker
diff --git a/Resources/Prototypes/_NF/Shipyard/investigator.yml b/Resources/Prototypes/_NF/Shipyard/investigator.yml
index 1054a43f6d6..1a328d1d0ce 100644
--- a/Resources/Prototypes/_NF/Shipyard/investigator.yml
+++ b/Resources/Prototypes/_NF/Shipyard/investigator.yml
@@ -19,6 +19,9 @@
   guidebookPage: ShipyardInvestigator
   class:
   - Science
+  engine:
+  - Solar
+  - Plasma
 
 - type: gameMap
   id: Investigator
diff --git a/Resources/Prototypes/_NF/Shipyard/kestrel.yml b/Resources/Prototypes/_NF/Shipyard/kestrel.yml
index 080c742080a..9fc69e361c1 100644
--- a/Resources/Prototypes/_NF/Shipyard/kestrel.yml
+++ b/Resources/Prototypes/_NF/Shipyard/kestrel.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardKestrel
   class:
   - Salvage
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Kestrel
diff --git a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml
index 98a2f657ac2..524b40e1a9e 100644
--- a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml
+++ b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardKilderkin
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Kilderkin
diff --git a/Resources/Prototypes/_NF/Shipyard/lantern.yml b/Resources/Prototypes/_NF/Shipyard/lantern.yml
index 614dc936bcd..a27540e1ebb 100644
--- a/Resources/Prototypes/_NF/Shipyard/lantern.yml
+++ b/Resources/Prototypes/_NF/Shipyard/lantern.yml
@@ -19,6 +19,9 @@
   guidebookPage: ShipyardLantern
   class:
   - Civilian
+  engine:
+  - Solar
+  - Plasma
 
 - type: gameMap
   id: Lantern
diff --git a/Resources/Prototypes/_NF/Shipyard/legman.yml b/Resources/Prototypes/_NF/Shipyard/legman.yml
index 155aac28d20..c05e92af892 100644
--- a/Resources/Prototypes/_NF/Shipyard/legman.yml
+++ b/Resources/Prototypes/_NF/Shipyard/legman.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardLegman
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Legman
diff --git a/Resources/Prototypes/_NF/Shipyard/liquidator.yml b/Resources/Prototypes/_NF/Shipyard/liquidator.yml
index b9c0b83f4bd..85764760153 100644
--- a/Resources/Prototypes/_NF/Shipyard/liquidator.yml
+++ b/Resources/Prototypes/_NF/Shipyard/liquidator.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardLiquidator
   class:
   - Civilian
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Liquidator
diff --git a/Resources/Prototypes/_NF/Shipyard/loader.yml b/Resources/Prototypes/_NF/Shipyard/loader.yml
index b0b4ea190fe..91309f9e571 100644
--- a/Resources/Prototypes/_NF/Shipyard/loader.yml
+++ b/Resources/Prototypes/_NF/Shipyard/loader.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardLoader
   class:
   - Cargo
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Loader
diff --git a/Resources/Prototypes/_NF/Shipyard/lyrae.yml b/Resources/Prototypes/_NF/Shipyard/lyrae.yml
index 6cd07f2a89f..d98e0cb5461 100644
--- a/Resources/Prototypes/_NF/Shipyard/lyrae.yml
+++ b/Resources/Prototypes/_NF/Shipyard/lyrae.yml
@@ -19,6 +19,8 @@
   guidebookPage: Null
   class:
   - Science
+  engine:
+  - AME
 
 - type: gameMap
   id: Lyrae
diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml
index 19f44fe89a2..9b130599e7a 100644
--- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml
@@ -16,6 +16,8 @@
   guidebookPage: ShipyardMcCargo
   class:
   - Kitchen
+  engine:
+  - Plasma
 
 - type: gameMap
   id: McCargo
diff --git a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml
index 312b3003cbe..2f057c6979c 100644
--- a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml
+++ b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml
@@ -16,6 +16,8 @@
   guidebookPage: ShipyardMcDelivery
   class:
   - Civilian
+  engine:
+  - Welding
 
 - type: gameMap
   id: McDelivery
diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml
index 7ac6353e848..b8ed87a4845 100644
--- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml
+++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml
@@ -10,6 +10,8 @@
   class:
   - Science
   - Engineering
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Phoenix
diff --git a/Resources/Prototypes/_NF/Shipyard/piecrust.yml b/Resources/Prototypes/_NF/Shipyard/piecrust.yml
index c2daed8fe63..4673bca3430 100644
--- a/Resources/Prototypes/_NF/Shipyard/piecrust.yml
+++ b/Resources/Prototypes/_NF/Shipyard/piecrust.yml
@@ -19,6 +19,8 @@
   guidebookPage: Null
   class:
   - Kitchen
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Piecrust
diff --git a/Resources/Prototypes/_NF/Shipyard/pioneer.yml b/Resources/Prototypes/_NF/Shipyard/pioneer.yml
index 9705733c1f5..9c311ff0d40 100644
--- a/Resources/Prototypes/_NF/Shipyard/pioneer.yml
+++ b/Resources/Prototypes/_NF/Shipyard/pioneer.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardPioneer
   class:
   - Salvage
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Pioneer
diff --git a/Resources/Prototypes/_NF/Shipyard/placebo.yml b/Resources/Prototypes/_NF/Shipyard/placebo.yml
index 2d674a1a661..bd21d23be7d 100644
--- a/Resources/Prototypes/_NF/Shipyard/placebo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/placebo.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardPlacebo
   class:
   - Medical
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Placebo
diff --git a/Resources/Prototypes/_NF/Shipyard/prospector.yml b/Resources/Prototypes/_NF/Shipyard/prospector.yml
index 7a4e6d6b36c..9b3239da023 100644
--- a/Resources/Prototypes/_NF/Shipyard/prospector.yml
+++ b/Resources/Prototypes/_NF/Shipyard/prospector.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardProspector
   class:
   - Salvage
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Prospector
diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml
index e4f7ee0b0c8..ab23a8a13ef 100644
--- a/Resources/Prototypes/_NF/Shipyard/pts.yml
+++ b/Resources/Prototypes/_NF/Shipyard/pts.yml
@@ -19,6 +19,8 @@
   guidebookPage: Null
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: PTS
diff --git a/Resources/Prototypes/_NF/Shipyard/searchlight.yml b/Resources/Prototypes/_NF/Shipyard/searchlight.yml
index cdc65127291..5de7e5237a4 100644
--- a/Resources/Prototypes/_NF/Shipyard/searchlight.yml
+++ b/Resources/Prototypes/_NF/Shipyard/searchlight.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardSearchlight
   class:
   - Medical
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Searchlight
diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml
index 144de23f9d2..0930de60dc1 100644
--- a/Resources/Prototypes/_NF/Shipyard/skipper.yml
+++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardSkipper
   class:
   - Kitchen
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Skipper
diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml
index 2cbb753ee00..c4563840860 100644
--- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml
+++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml
@@ -20,6 +20,8 @@
   class:
   - Science
   - Engineering
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Sparrow
diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml
index db1385cc9b8..6221dffb172 100644
--- a/Resources/Prototypes/_NF/Shipyard/spectre.yml
+++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml
@@ -19,6 +19,8 @@
   guidebookPage: Null
   class:
   - Science
+  engine:
+  - AME
 
 - type: gameMap
   id: Spectre
diff --git a/Resources/Prototypes/_NF/Shipyard/spirit.yml b/Resources/Prototypes/_NF/Shipyard/spirit.yml
index 1e869c0ea1a..e0d9658bc46 100644
--- a/Resources/Prototypes/_NF/Shipyard/spirit.yml
+++ b/Resources/Prototypes/_NF/Shipyard/spirit.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardSpirit
   class:
   - Medical
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Spirit
diff --git a/Resources/Prototypes/_NF/Shipyard/stasis.yml b/Resources/Prototypes/_NF/Shipyard/stasis.yml
index c3c8e89ce0f..461e9af0515 100644
--- a/Resources/Prototypes/_NF/Shipyard/stasis.yml
+++ b/Resources/Prototypes/_NF/Shipyard/stasis.yml
@@ -19,6 +19,8 @@
   guidebookPage: ShipyardStasis
   class:
   - Medical
+  engine:
+  - Uranium
 
 - type: gameMap
   id: Stasis
diff --git a/Resources/Prototypes/_NF/Shipyard/stellaris.yml b/Resources/Prototypes/_NF/Shipyard/stellaris.yml
index 8e21f63bba9..d1645401d6f 100644
--- a/Resources/Prototypes/_NF/Shipyard/stellaris.yml
+++ b/Resources/Prototypes/_NF/Shipyard/stellaris.yml
@@ -9,6 +9,8 @@
   guidebookPage: Null
   class:
   - Civilian
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Stellaris
diff --git a/Resources/Prototypes/_NF/Shipyard/vagabond.yml b/Resources/Prototypes/_NF/Shipyard/vagabond.yml
index 46510512c3f..448d9e07c75 100644
--- a/Resources/Prototypes/_NF/Shipyard/vagabond.yml
+++ b/Resources/Prototypes/_NF/Shipyard/vagabond.yml
@@ -20,6 +20,8 @@
   guidebookPage: ShipyardVagabond
   class:
   - Cargo
+  engine:
+  - Plasma
 
 - type: gameMap
   id: Vagabond