From 488d714e4c39ef3127a25f8d010ce53708f43636 Mon Sep 17 00:00:00 2001
From: Pcol <mandarincik3000@gmail.com>
Date: Tue, 4 Aug 2026 21:44:03 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=9A=D1=82=D0=BE-=D1=82=D0=BE=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B1=D1=8B=D0=BB=20=D0=BF=D1=80=D0=BE=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B8=20=D0=B2?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D1=82=D0=B8=D0=BF=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Research/UI/FancyResearchConsoleItem.xaml |  16 +-
 .../Research/UI/FancyResearchConsoleMenu.xaml |  52 ++++-
 .../UI/FancyResearchConsoleMenu.xaml.cs       | 212 +++++++++++++++++-
 .../Locale/en-US/_Goobstation/research/ui.ftl |   1 +
 .../Locale/en-US/_LuaM/research/arsenal.ftl   |   3 +
 .../en-US/_LuaM/research/civilianservices.ftl |   5 +
 .../Locale/ru-RU/_Goobstation/research/ui.ftl |   3 +-
 .../Locale/ru-RU/_LuaM/research/arsenal.ftl   |   3 +
 .../civilianservices.ftl}                     |   3 +-
 .../ru-RU/_Mono/research/disciplines.ftl      |   4 +-
 .../_Mono/research/faction-universal.ftl      |   4 +-
 .../Locale/ru-RU/_Mono/research/mechs.ftl     |   8 +-
 .../ru-RU/_Mono/research/rogue-research.ftl   |  28 +++
 .../ru-RU/_Mono/research/technologies.ftl     |  12 +-
 .../ru-RU/_Mono/research/tsf-research.ftl     |  28 +++
 .../ru-RU/_Mono/research/ussp-research.ftl    |  28 +--
 Resources/Locale/ru-RU/cargo/bounties.ftl     |   2 +-
 .../Locale/ru-RU/research/technologies.ftl    |  13 +-
 .../science/techdisks/tech_disks_science.ftl  |   2 +
 .../entities/objects/devices/flatpack.ftl     |   2 +-
 .../objects/electronics/datafarms.ftl         |   8 +-
 .../structures/machines/datafarms.ftl         |   4 +-
 .../structures/machines/faction_servers.ftl   |   2 +-
 .../entities/objects/devices/flatpacks.ftl    |   4 +-
 .../circuitboards/machine/production.ftl      |   2 +-
 .../entities/structures/machines/research.ftl |   2 +-
 Resources/Maps/_LuaM/POI/camelotLuaM.yml      |   2 +-
 .../Entities/Structures/Machines/lathe.yml    |   3 +
 .../Recipes/Lathes/Packs/science.yml          |   2 +-
 Resources/Prototypes/Research/arsenal.yml     |  17 +-
 .../Prototypes/Research/civilianservices.yml  |  48 ++--
 Resources/Prototypes/Research/disciplines.yml |   8 +-
 .../Prototypes/Research/experimental.yml      |  16 +-
 Resources/Prototypes/Research/industrial.yml  |  42 ++--
 .../_DV/Research/civilianservices.yml         |   2 +-
 .../_FarHorizons/Research/industrial.yml      |  10 +-
 .../_Goobstation/Research/arsenal.yml         |   5 +-
 .../Science/TechDisks/tech_disks_science.yml  |  19 ++
 .../Recipes/Lathes/Factions/melee_weapons.yml |   4 +
 .../_LuaM/Recipes/Lathes/Factions/misc.yml    |   4 +
 .../_LuaM/Recipes/Lathes/Packs/arsenal.yml    |  40 ++++
 .../_LuaM/Recipes/Lathes/Packs/medical.yml    |   5 +
 .../Lathes/Packs/\321\201ircuitboard.yml"     |   4 +
 .../_LuaM/Recipes/Lathes/clothing-armor.yml   |  55 +++++
 .../_LuaM/Recipes/Lathes/electronics.yml      |   4 +
 .../_LuaM/Research/TSFMC/tsf_misc.yml         |  13 ++
 .../Prototypes/_LuaM/Research/arsenal.yml     |  64 ++++++
 .../_LuaM/Research/civilianservices.yml       |  28 ++-
 .../VendingMachines/Inventories/ussp.yml      |   2 +-
 .../Entities/Objects/Devices/flatpack.yml     |  27 +--
 .../Objects/Electronics/datafarms.yml         |   8 +-
 .../Science/TechDisks/tech_disk_spawners.yml  |  10 +-
 .../Structures/Machines/datafarms.yml         |   4 +-
 .../Structures/Machines/disk_printer.yml      |   3 +
 .../Structures/Machines/faction_servers.yml   |   9 +-
 .../Entities/Structures/Machines/lathe.yml    |   6 +
 .../Recipes/Crafting/Graphs/datafarm.yml      |  37 +--
 .../_Mono/Recipes/Lathes/Factions/misc.yml    |  10 +-
 .../Recipes/Lathes/Packs/Factions/tsfmc.yml   |   6 +-
 .../_Mono/Research/Organizations/ullman.yml   |  12 +-
 .../_Mono/Research/Rogue/faction_tacsuits.yml |  13 +-
 .../_Mono/Research/Rogue/rogue_misc.yml       |  57 +++--
 .../_Mono/Research/Rogue/rogue_weapons.yml    |  23 +-
 .../_Mono/Research/TSF/faction_tacsuits.yml   |   7 +-
 .../_Mono/Research/TSF/tsf_misc.yml           |  46 ++--
 .../_Mono/Research/TSF/tsf_weapons.yml        |  11 +-
 .../_Mono/Research/USSP/ussp_misc.yml         |   6 +-
 .../_Mono/Research/USSP/ussp_suits.yml        |  13 +-
 .../_Mono/Research/USSP/ussp_weapons.yml      |  23 +-
 .../_Mono/Research/Universal/armor_plates.yml |   4 +-
 .../_Mono/Research/Universal/economy.yml      |   4 +-
 .../_Mono/Research/Universal/explosives.yml   |   7 +-
 .../Research/Universal/prerequisites.yml      |  10 +-
 .../_Mono/Research/Universal/shipgun_ammo.yml |  26 +--
 .../_Mono/Research/Universal/smallarms.yml    |   8 +-
 .../Prototypes/_Mono/Research/arsenal.yml     |  21 +-
 .../_Mono/Research/experimental.yml           |  14 +-
 .../_Mono/Research/mech_research.yml          |  20 +-
 .../_Mono/Research/shuttlecomps.yml           |  11 +-
 Resources/Prototypes/_Mono/disciplines.yml    |  30 +--
 .../Entities/Structures/Machines/lathe.yml    |   5 +
 .../Deprecated/hacked_mercenary_techfab.yml   |   4 +-
 .../Packs/Deprecated/mercenary_techfab.yml    |  44 ++--
 .../_NF/Recipes/Lathes/clothing-armor.yml     |   7 +
 Resources/Prototypes/_NF/Research/arsenal.yml |  55 ++---
 .../_NF/Research/civilianservices.yml         |  11 +-
 .../Prototypes/_NF/Research/experimental.yml  |   6 +-
 .../Prototypes/_NF/Research/industrial.yml    |   9 +-
 .../_Shitmed/Research/civilianservices.yml    |   3 +-
 .../_White/Research/experimental.yml          |   8 +-
 90 files changed, 1045 insertions(+), 441 deletions(-)
 create mode 100644 Resources/Locale/en-US/_LuaM/research/arsenal.ftl
 create mode 100644 Resources/Locale/en-US/_LuaM/research/civilianservices.ftl
 create mode 100644 Resources/Locale/ru-RU/_LuaM/research/arsenal.ftl
 rename Resources/Locale/ru-RU/_LuaM/{technologies/techonologies.ftl => research/civilianservices.ftl} (73%)
 create mode 100644 Resources/Locale/ru-RU/_Mono/research/rogue-research.ftl
 create mode 100644 Resources/Locale/ru-RU/_Mono/research/tsf-research.ftl
 create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/objects/specific/science/techdisks/tech_disks_science.ftl
 create mode 100644 Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks/tech_disks_science.yml
 create mode 100644 Resources/Prototypes/_LuaM/Recipes/Lathes/Factions/melee_weapons.yml
 create mode 100644 Resources/Prototypes/_LuaM/Recipes/Lathes/Factions/misc.yml
 create mode 100644 Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/arsenal.yml
 create mode 100644 Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/medical.yml
 create mode 100644 "Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/\321\201ircuitboard.yml"
 create mode 100644 Resources/Prototypes/_LuaM/Recipes/Lathes/clothing-armor.yml
 create mode 100644 Resources/Prototypes/_LuaM/Recipes/Lathes/electronics.yml
 create mode 100644 Resources/Prototypes/_LuaM/Research/TSFMC/tsf_misc.yml
 create mode 100644 Resources/Prototypes/_LuaM/Research/arsenal.yml

diff --git a/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleItem.xaml b/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleItem.xaml
index d47e2ee14e3..1b382b2a24a 100644
--- a/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleItem.xaml
+++ b/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleItem.xaml
@@ -2,9 +2,9 @@
                  xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                  xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                  xmlns:goob="clr-namespace:Content.Client._Goobstation.Research.UI"
-                 Margin="4"
-                 HorizontalExpand="False">  <!-- Frontier: Margin="5" < Margin="4" -->
-    <BoxContainer Orientation="Vertical" SetSize="64 64"> <!-- Frontier: "80 80" < "64 64" -->
+                 Margin="6"
+                 HorizontalExpand="False">  <!-- Frontier: Margin="5" < Margin="4" --> <!-- LuaM: Margin="4" > Margin="6" -->
+    <BoxContainer Orientation="Vertical" SetSize="51 51"> <!-- Frontier: "80 80" < "64 64" --> <!-- LuaM: "64 64" > "51 51" -->
         <PanelContainer VerticalExpand="True"
                         HorizontalExpand="True"
                         Name="Panel">
@@ -13,10 +13,10 @@
                              ModulateSelfOverride="#00000000"
                              HorizontalExpand="True"/>
             <EntityPrototypeView
-                Name="ResearchDisplay"
-                Scale="1.75 1.75"
-                SetSize="56 56">
-            </EntityPrototypeView> <!-- Frontier: "2" < "1.75", "64 64" < "56 56" -->
+                Name="ResearchDisplay" 
+                Scale="1.42 1.42"
+                SetSize="46 46">
+            </EntityPrototypeView> <!-- Frontier: "2" < "1.75", "64 64" < "56 56" --> <!-- LuaM: "1.75" 1.75" > "1.42 1.42", "64 64" > "46 46" -->
         </PanelContainer>
     </BoxContainer>
-</LayoutContainer>
+</LayoutContainer>
\ No newline at end of file
diff --git a/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleMenu.xaml b/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleMenu.xaml
index 64db9850252..3ba77689303 100644
--- a/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleMenu.xaml
+++ b/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleMenu.xaml
@@ -1,11 +1,10 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls;assembly=Content.Client"
-                      xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls;assembly=Content.Client"
                       xmlns:goob="clr-namespace:Content.Client._Goobstation.Research.UI"
                       Title="{Loc 'research-console-menu-title'}"
-                      SetSize="1260 850"
-                      MinSize="600 400"> <!-- Frontier: add MinSize-->
+                      SetSize="1450 1025"
+                      MinSize="600 400"> <!-- Frontier: add MinSize--> <!-- LuaM: SetSize= "1260 850" > "1450 1025"-->
     <BoxContainer Orientation="Vertical"
                   HorizontalExpand="True"
                   VerticalExpand="True">
@@ -24,9 +23,37 @@
                 <Button Name="ServerButton" Text="{Loc 'research-console-menu-server-selection-button'}" MinHeight="40"/>
             </BoxContainer>
         </BoxContainer>
-        <BoxContainer Orientation="Horizontal"
+        <!-- LuaM-start:-->
+        <PanelContainer Name="DisciplineSelectionScreen"
+                        VerticalExpand="True"
+                        HorizontalExpand="True"
+                        Visible="True">
+            <PanelContainer.PanelOverride>
+                <gfx:StyleBoxFlat BackgroundColor="#222226FF" />
+            </PanelContainer.PanelOverride>
+            <ScrollContainer HScrollEnabled="False"
+                             HorizontalExpand="True"
+                             VerticalExpand="True">
+                <BoxContainer Orientation="Vertical"
+                              HorizontalExpand="True"
+                              VerticalExpand="True">
+                    <Control VerticalExpand="True" MinHeight="180"/>
+                    <GridContainer Name="DisciplineGrid"
+                                   Columns="3"
+                                   HorizontalAlignment="Center"
+                                   HorizontalExpand="True"
+                                   Margin="20">
+                    </GridContainer>
+                    <Control VerticalExpand="True"/>
+                </BoxContainer>
+            </ScrollContainer>
+        </PanelContainer>
+        <BoxContainer Name="ResearchFieldScreen"
+                      Orientation="Horizontal"
                       HorizontalExpand="True"
-                      VerticalExpand="True">
+                      VerticalExpand="True"
+                      Visible="False">
+		    <!-- LuaM-end:-->
             <BoxContainer Orientation="Vertical"
                           VerticalExpand="True"
                           HorizontalExpand="True"
@@ -36,15 +63,22 @@
                     <PanelContainer.PanelOverride>
                         <gfx:StyleBoxFlat BackgroundColor="#222226FF" />
                     </PanelContainer.PanelOverride>
+				    <!-- LuaM-start:-->
+                    <Button Name="BackToDisciplinesButton"
+                            Text="{Loc 'research-console-menu-back-button'}"
+                            MinHeight="40"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Margin="5 5"/>
+					<!-- LuaM-end:-->
                     <goob:ResearchesContainerPanel
                         HorizontalExpand="True"
                         VerticalExpand="True"
                         Name="DragContainer"
                         MouseFilter="Pass"
                         RectClipContent="True">
-                        <!-- There lives all of technologies -->
+					<!-- There lives all of technologies -->
                     </goob:ResearchesContainerPanel>
-                    <Button Name="RecenterButton" Text="{Loc 'research-console-menu-recenter-button'}" MinHeight="40" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5 -5"/>
                 </PanelContainer>
             </BoxContainer>
             <PanelContainer SizeFlagsStretchRatio="2">
@@ -57,7 +91,7 @@
                     HorizontalExpand="True"
                     SizeFlagsStretchRatio="1"
                     Margin="0">
-                    <!-- Frontier: add a placeholder so the scrollable interface doesn't immediately shrink, matches InfoPanel size -->
+					<!-- Frontier: add a placeholder so the scrollable interface doesn't immediately shrink, matches InfoPanel size -->
                     <Control
                         Margin="5"
                         MinWidth="450"
@@ -67,4 +101,4 @@
             </PanelContainer>
         </BoxContainer>
     </BoxContainer>
-</controls:FancyWindow>
+</controls:FancyWindow>
\ No newline at end of file
diff --git a/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleMenu.xaml.cs b/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleMenu.xaml.cs
index 6e7907894c2..e705b91f9dc 100644
--- a/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleMenu.xaml.cs
+++ b/Content.Client/_Goobstation/Research/UI/FancyResearchConsoleMenu.xaml.cs
@@ -56,28 +56,35 @@ public sealed partial class FancyResearchConsoleMenu : FancyWindow
     /// <summary>
     /// Is tech currently being dragged
     /// </summary>
-    private bool _draggin;
+//    private bool _draggin; // Commented by LuaM
+
+// LuaM-start:
+    /// <summary>
+    /// If the branch is null, the user is on the branch selection screen.
+    /// </summary>
+    private ProtoId<TechDisciplinePrototype>? _selectedDiscipline;
+// LuaM-end.
 
     /// <summary>
     /// Global position that all tech relates to.
-    /// For dragging mostly
+	/// For dragging mostly
     /// </summary>
     private Vector2 _position = DefaultPosition;
 
     /// <summary>
-    /// Captures the initial position to use with recenter button
+	/// Captures the initial position to use with recenter button
     /// </summary>
-    private Vector2 _initialViewPosition;
+//    private Vector2 _initialViewPosition; // Commented by LuaM
 
     /// <summary>
     /// Tracks if first initialization has happened
     /// </summary>
-    private bool _firstInitialization = true;
+//    private bool _firstInitialization = true; // Commented by LuaM
 
     /// <summary>
     /// Frontier: the distance between elements on the grid.
     /// </summary>
-    private const int GridSize = 90;
+    private const int GridSize = 64; // LuaM: 90 > 64
 
     /// <summary>
     /// Frontier: technology cards size.
@@ -102,14 +109,27 @@ public FancyResearchConsoleMenu()
         _accessReader = _entity.System<AccessReaderSystem>();
 
         // Frontier: Initialize parallax background
-        _parallaxControl = new ParallaxControl
+//        _parallaxControl = new ParallaxControl // Commented by LuaM
+        var disciplineParallax = new ParallaxControl // LuaM
         {
             ParallaxPrototype = "Default",
             HorizontalExpand = true,
             VerticalExpand = true,
         };
+// LuaM-start:
+        DisciplineSelectionScreen.AddChild(disciplineParallax);
+        disciplineParallax.SetPositionInParent(0);
+// LuaM-end.
 
         // Add the parallax control to the ResearchesContainer at the beginning (bottom layer)
+// LuaM-start:
+        _parallaxControl = new ParallaxControl
+        {
+            ParallaxPrototype = "Default",
+            HorizontalExpand = true,
+            VerticalExpand = true,
+        };
+// LuaM-end.
         ResearchesContainer.AddChild(_parallaxControl);
 
         // Set the proper rendering order by adjusting positions in the parent's child list
@@ -120,13 +140,17 @@ public FancyResearchConsoleMenu()
         // The drag container should be in the middle
         DragContainer.SetPositionInParent(1);
 
+        ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke();
         // The recenter button should be at the top of the z-order (drawn last)
+// Commented by LuaM
+/*
         RecenterButton.SetPositionInParent(2);
 
-        ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke();
         DragContainer.OnKeyBindDown += OnKeybindDown;
         DragContainer.OnKeyBindUp += OnKeybindUp;
         RecenterButton.OnPressed += _ => Recenter();
+*/
+        BackToDisciplinesButton.OnPressed += _ => ShowDisciplineSelection(); // LuaM
 
         // Empty initialization
         UpdatePanels(List);
@@ -137,9 +161,12 @@ public void SetEntity(EntityUid entity)
 
     public void UpdatePanels(Dictionary<string, ResearchAvailability> dict)
     {
-        DragContainer.RemoveAllChildren();
+//        DragContainer.RemoveAllChildren(); // Commented by LuaM
         List = dict;
+        BuildDisciplineGrid(); // LuaM
 
+// Commented by LuaM
+/*
         foreach (var tech in List)
         {
             var proto = _prototype.Index<TechnologyPrototype>(tech.Key);
@@ -155,6 +182,11 @@ public void UpdatePanels(Dictionary<string, ResearchAvailability> dict)
             if (tech.Key == CurrentTech)
                 SelectTech(proto, tech.Value);
         }
+*/
+// LuaM-start:
+        if (_selectedDiscipline != null)
+            PopulateResearchField();
+// LuaM-end.
     }
 
     public void UpdateInformationPanel(int points)
@@ -201,6 +233,8 @@ public void UpdateInformationPanel(int points)
         }
     }
 
+// Commented by LuaM
+/*
     #region Drag handle
     protected override void MouseMove(GUIMouseMoveEventArgs args)
     {
@@ -218,33 +252,181 @@ protected override void MouseMove(GUIMouseMoveEventArgs args)
 
         // Move all tech
         foreach (var child in DragContainer.Children)
-        {
+            {
             LayoutContainer.SetPosition(child, child.Position + diff); // Frontier: args.Relative<diff
         }
     }
+*/
+
+// LuaM-start:
+    private void BuildDisciplineGrid()
+    {
+        DisciplineGrid.RemoveAllChildren();
+
+        if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database))
+            return;
+
+        foreach (var disciplineId in database.SupportedDisciplines)
+        {
+            var discipline = _prototype.Index<TechDisciplinePrototype>(disciplineId);
+            var tier = _research.GetTierCompletionPercentage(database, discipline, _prototype);
+
+            var button = new Button
+            {
+                MinSize = new Vector2(240, 35),
+                HorizontalExpand = false,
+                Margin = new Thickness(8)
+            };
+
+            var container = new BoxContainer
+            {
+                Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                HorizontalExpand = true,
+                VerticalExpand = true,
+                Align = BoxContainer.AlignMode.Center
+            };
+
+            var texture = new TextureRect
+            {
+                Texture = _sprite.Frame0(discipline.Icon),
+                TextureScale = new Vector2(2.5f, 2.5f),
+                VerticalAlignment = VAlignment.Center,
+                Margin = new Thickness(8, 0, 8, 0)
+            };
+            container.AddChild(texture);
+
+            var separator = new Label
+            {
+                Text = "|",
+                VerticalAlignment = VAlignment.Center,
+                Margin = new Thickness(0, 0, 8, 0)
+            };
+            container.AddChild(separator);
+
+            var progressLabel = new Label
+            {
+                Text = tier + "%",
+                VerticalAlignment = VAlignment.Center,
+                MinWidth = 50,
+                Margin = new Thickness(0, 0, 8, 0)
+            };
+            container.AddChild(progressLabel);
+
+            var nameLabel = new Label
+            {
+                Text = Loc.GetString(discipline.UiName),
+                VerticalAlignment = VAlignment.Center,
+                HorizontalExpand = true
+            };
+            container.AddChild(nameLabel);
+
+            button.AddChild(container);
+
+            var capturedDisciplineId = disciplineId;
+            button.OnPressed += _ => OnDisciplineSelected(capturedDisciplineId);
+
+            DisciplineGrid.AddChild(button);
+        }
+    }
+// LuaM-end.
 
+// Commented by LuaM
     /// <summary>
     /// Raised when LMB is pressed at <see cref="DragContainer"/>
     /// </summary>
+/*
     private void OnKeybindDown(GUIBoundKeyEventArgs args)
     {
         if (args.Function == EngineKeyFunctions.Use)
             _draggin = true;
     }
+*/
 
+// LuaM-start:
+    private void OnDisciplineSelected(ProtoId<TechDisciplinePrototype> disciplineId)
+    {
+        _selectedDiscipline = disciplineId;
+        DisciplineSelectionScreen.Visible = false;
+        ResearchFieldScreen.Visible = true;
+        PopulateResearchField();
+    }
+// LuaM-end.
+
+// Commented by LuaM
     /// <summary>
     /// Raised when LMB is unpressed at <see cref="DragContainer"/>
     /// </summary>
+/*
     private void OnKeybindUp(GUIBoundKeyEventArgs args)
     {
         if (args.Function == EngineKeyFunctions.Use)
             _draggin = false;
     }
+*/
 
+// LuaM-start:
+    private void ShowDisciplineSelection()
+    {
+        _selectedDiscipline = null;
+        CurrentTech = null;
+        DisciplineSelectionScreen.Visible = true;
+        ResearchFieldScreen.Visible = false;
+        DragContainer.RemoveAllChildren();
+        InfoContainer.RemoveAllChildren();
+        InfoContainer.AddChild(new Control
+        {
+            Margin = new Thickness(5),
+            MinWidth = 450,
+            VerticalExpand = true,
+            HorizontalExpand = true
+        });
+// LuaM-end.
+    }
+
+// Commented by LuaM
+/*
     protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
         => _draggin ? DragMode.None : base.GetDragModeFor(relativeMousePos);
     #endregion
+*/
+
+// LuaM-start:
+    private void PopulateResearchField()
+    {
+        DragContainer.RemoveAllChildren();
+        InfoContainer.RemoveAllChildren();
+        InfoContainer.AddChild(new Control
+        {
+            Margin = new Thickness(5),
+            MinWidth = 450,
+            VerticalExpand = true,
+            HorizontalExpand = true
+        });
+
+        if (_selectedDiscipline == null)
+            return;
+
+        _position = DefaultPosition;
 
+        foreach (var tech in List)
+        {
+            var proto = _prototype.Index<TechnologyPrototype>(tech.Key);
+
+            if (proto.Discipline != _selectedDiscipline.Value)
+                continue;
+
+            var control = new FancyResearchConsoleItem(proto, _sprite, tech.Value);
+            DragContainer.AddChild(control);
+
+            var uiPosition = _position + proto.Position * GridSize;
+            LayoutContainer.SetPosition(control, uiPosition);
+            control.SelectAction += SelectTech;
+
+            if (tech.Key == CurrentTech)
+                SelectTech(proto, tech.Value);
+        }
+    }
+// LuaM-end.
     /// <summary>
     /// Selects a tech prototype and opens info panel
     /// </summary>
@@ -262,6 +444,8 @@ public void SelectTech(TechnologyPrototype proto, ResearchAvailability availabil
         InfoContainer.AddChild(control);
     }
 
+// Commented by LuaM
+/*
     /// <summary>
     /// Resets the view exactly to the initial position when the UI was first opened
     /// </summary>
@@ -279,6 +463,7 @@ public void Recenter()
             LayoutContainer.SetPosition(child, child.Position + diff);
         }
     }
+*/
 
     public override void Close()
     {
@@ -286,11 +471,14 @@ public override void Close()
 
         DragContainer.RemoveAllChildren();
         InfoContainer.RemoveAllChildren();
-        _firstInitialization = true;
+//	      _firstInitialization = true; // Commented by LuaM
+        _selectedDiscipline = null;
+        DisciplineSelectionScreen.Visible = true;
+        ResearchFieldScreen.Visible = false;
     }
 
     private sealed partial class DisciplineButton(TechDisciplinePrototype proto) : Button
     {
         public TechDisciplinePrototype Proto = proto;
     }
-}
+}
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Goobstation/research/ui.ftl b/Resources/Locale/en-US/_Goobstation/research/ui.ftl
index 150332c6fcb..f6d33aac839 100644
--- a/Resources/Locale/en-US/_Goobstation/research/ui.ftl
+++ b/Resources/Locale/en-US/_Goobstation/research/ui.ftl
@@ -5,3 +5,4 @@ research-console-menu-recenter-button = Recenter
 research-console-menu-server-researched-button = Researched
 research-console-tech-cost-label = { $cost } R.P.
 research-console-tier-percentage = : { $perc }%
+research-console-menu-back-button = Back
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_LuaM/research/arsenal.ftl b/Resources/Locale/en-US/_LuaM/research/arsenal.ftl
new file mode 100644
index 00000000000..3113cc15f54
--- /dev/null
+++ b/Resources/Locale/en-US/_LuaM/research/arsenal.ftl
@@ -0,0 +1,3 @@
+research-technology-armor-basic = Basic Armor
+research-technology-armor-advanced = Advanced Armor
+research-technology-punk-gear = Punk Gear
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_LuaM/research/civilianservices.ftl b/Resources/Locale/en-US/_LuaM/research/civilianservices.ftl
new file mode 100644
index 00000000000..123eef5c471
--- /dev/null
+++ b/Resources/Locale/en-US/_LuaM/research/civilianservices.ftl
@@ -0,0 +1,5 @@
+research-technology-implants = Advanced Prosthetics
+research-technology-cybernetic-organs = Organ Enhancements
+research-technology-cybernetic-liver = Artificial Filtration
+research-technology-upgraded-cybernetic-organs = Vacuum Survival
+research-technology-advanced-hydroponics = Advanced Hydroponics
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_Goobstation/research/ui.ftl b/Resources/Locale/ru-RU/_Goobstation/research/ui.ftl
index b780b5ae936..1985cc9080b 100644
--- a/Resources/Locale/ru-RU/_Goobstation/research/ui.ftl
+++ b/Resources/Locale/ru-RU/_Goobstation/research/ui.ftl
@@ -4,4 +4,5 @@ research-console-no-tech-requirements = [color=green]Эта технология
 research-console-menu-recenter-button = Центрировать
 research-console-menu-server-researched-button = Изученные
 research-console-tech-progress-rp = { $percent }% ОИ
-research-console-tech-progress-prereqs = { $percent }%
\ No newline at end of file
+research-console-tech-progress-prereqs = { $percent }%
+research-console-menu-back-button = Назад
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_LuaM/research/arsenal.ftl b/Resources/Locale/ru-RU/_LuaM/research/arsenal.ftl
new file mode 100644
index 00000000000..33a01e010c4
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LuaM/research/arsenal.ftl
@@ -0,0 +1,3 @@
+research-technology-armor-basic = Базовое бронирование
+research-technology-armor-advanced = Продвинутое бронирование
+research-technology-punk-gear = Панковское снаряжение
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_LuaM/technologies/techonologies.ftl b/Resources/Locale/ru-RU/_LuaM/research/civilianservices.ftl
similarity index 73%
rename from Resources/Locale/ru-RU/_LuaM/technologies/techonologies.ftl
rename to Resources/Locale/ru-RU/_LuaM/research/civilianservices.ftl
index 541c5e018f0..266dfb86bc5 100644
--- a/Resources/Locale/ru-RU/_LuaM/technologies/techonologies.ftl
+++ b/Resources/Locale/ru-RU/_LuaM/research/civilianservices.ftl
@@ -1,4 +1,5 @@
 research-technology-implants = Продвинутое протезирование
 research-technology-cybernetic-organs = Усиления организма
 research-technology-cybernetic-liver = Искусственная фильтрация
-research-technology-upgraded-cybernetic-organs = Выживание в вакууме
\ No newline at end of file
+research-technology-upgraded-cybernetic-organs = Выживание в вакууме
+research-technology-advanced-hydroponics = Продвинутая гидропоника
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_Mono/research/disciplines.ftl b/Resources/Locale/ru-RU/_Mono/research/disciplines.ftl
index 21232983075..9688c44a221 100644
--- a/Resources/Locale/ru-RU/_Mono/research/disciplines.ftl
+++ b/Resources/Locale/ru-RU/_Mono/research/disciplines.ftl
@@ -1,4 +1,4 @@
-research-discipline-mechs = Инженерия Механоидов
-research-discipline-faction-universal = Универсальные Фракционные Исследования
+research-discipline-mechs = Механоиды
+research-discipline-faction-universal = Материалы
 research-discipline-tsfmc = Исследования ТСФ
 research-discipline-pdv = Исследования Авангарда
diff --git a/Resources/Locale/ru-RU/_Mono/research/faction-universal.ftl b/Resources/Locale/ru-RU/_Mono/research/faction-universal.ftl
index 9a715fddc01..7805159b494 100644
--- a/Resources/Locale/ru-RU/_Mono/research/faction-universal.ftl
+++ b/Resources/Locale/ru-RU/_Mono/research/faction-universal.ftl
@@ -7,5 +7,5 @@ research-technology-universal-150mm-ammo = Производство 150-мм с
 research-technology-universal-light-fighter-ordinance = Производство боеголовок
 research-technology-universal-advanced-light-fighter-ordinance = Производство продвинутых боеголовок
 
-research-technology-universal-armorplates-1 = Баллистический композит
-research-technology-universal-armorplates-2 = Урановый композит
\ No newline at end of file
+research-technology-universal-armorplates-1 = Стандартные бронеплиты
+research-technology-universal-armorplates-2 = Продвинутые бронеплиты
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_Mono/research/mechs.ftl b/Resources/Locale/ru-RU/_Mono/research/mechs.ftl
index 2b373704245..2ec78d91401 100644
--- a/Resources/Locale/ru-RU/_Mono/research/mechs.ftl
+++ b/Resources/Locale/ru-RU/_Mono/research/mechs.ftl
@@ -1,4 +1,4 @@
-research-technology-broadsword = S2 Мехи
-research-technology-broadsword-subtypes = Продвинутые S2 Мехи
-research-technology-flail = S4 Мехи
-research-technology-flail-subtypes = S4 Боевые мехи
+research-technology-broadsword = Производство S2-механоидов
+research-technology-broadsword-subtypes = Производство продвинутых S2-механоидов
+research-technology-flail = Производство S4-механоидов
+research-technology-flail-subtypes = Производство продвинутых S4-механоидов
diff --git a/Resources/Locale/ru-RU/_Mono/research/rogue-research.ftl b/Resources/Locale/ru-RU/_Mono/research/rogue-research.ftl
new file mode 100644
index 00000000000..f4ac47f4981
--- /dev/null
+++ b/Resources/Locale/ru-RU/_Mono/research/rogue-research.ftl
@@ -0,0 +1,28 @@
+research-discipline-rogue-weaponry = АН | Арсенал
+research-discipline-rogue-gear = АН | Инструменты
+research-discipline-rogue-equipment = АН | Снаряжение
+research-discipline-rogue-shipyard = АН | Судостроение
+
+# T1 Авангарда
+research-technology-rogue-jaws = Модификация поршневых механизмов
+research-technology-rogue-basic-guns = Базовое вооружение Авангарда
+research-technology-pdv-basic-module = Разработка базовых модулей киборгов Авангарда
+research-technology-rogue-tier-one-vouchers = Базовое судостроение Авангарда
+research-technology-rogue-basic-equipment = Базовое снаряжение Авангарда
+
+# T2 Авангарда
+research-technology-rogue-advanced-guns = Продвинутое вооружение Авангарда
+research-technology-rogue-hypospray = Портативные инъекторы
+research-technology-rogue-emag = Портативные методы взлома
+research-technology-rogue-energy-weapon = Концентрация плазмы
+research-technology-rogue-subsonic = Дозвуковое вооружение Авангарда
+research-technology-rogue-tier-two-vouchers = Продвинутое судостроение Авангарда
+research-technology-rogue-advanced-equipment = Продвинутое снаряжение Авангарда
+
+# T3 Авангарда
+research-technology-rogue-tier-three-vouchers = Глобальное судостроение Авангарда
+research-technology-rogue-hf-sword = Модификации плазменного вооружения
+research-technology-rogue-syndicate-tacsuits = Боевые скафандры Авангарда
+research-technology-pdv-advanced-module = Разработка продвинутых модулей киборгов Авангарда
+research-technology-rogue-super-armor = Экспериментальное снаряжение Авангарда
+research-technology-rogue-heavy-weapons = Тяжёлое вооружение Авангарда
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_Mono/research/technologies.ftl b/Resources/Locale/ru-RU/_Mono/research/technologies.ftl
index 58523ad283a..fc9bbfc4c07 100644
--- a/Resources/Locale/ru-RU/_Mono/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/_Mono/research/technologies.ftl
@@ -1,5 +1,5 @@
-research-technology-merc-armement-simple = Простое производство наёмнического оружия
-research-technology-merc-armement-advanced = Продвинутое производство наёмнического оружия
+research-technology-merc-armement-simple = Производство простого вооружения
+research-technology-merc-armement-advanced = Производство продвинутого вооружения
 
 research-technology-printable-explosives = Взрывчатые устройства
 
@@ -12,8 +12,10 @@ research-technology-ullmansuits-high-end = U.I. Высококачественн
 
 research-technology-advanced-melee-combat-options = Расширенные возможности ведения ближнего боя
 
-research-technology-mechs-base = Базовое производство мехов
-research-technology-mechs-combat = Производство боевых мехов
+research-technology-mechs-base = Базовое производство механоидов
+research-technology-mechs-combat = Производство боевых механоидов
 
-research-technology-basic-economy = Портативное технологическое оборудование
+research-technology-basic-economy = Базовая переработка урана
 research-technology-uranium-processing-advanced = Усовершенствованная переработка урана
+
+research-technology-drones-1 = Работа с дронами
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_Mono/research/tsf-research.ftl b/Resources/Locale/ru-RU/_Mono/research/tsf-research.ftl
new file mode 100644
index 00000000000..c5b2f37e472
--- /dev/null
+++ b/Resources/Locale/ru-RU/_Mono/research/tsf-research.ftl
@@ -0,0 +1,28 @@
+research-discipline-tsfmc-weaponry = ТСФ | Арсенал
+research-discipline-tsfmc-gear = ТСФ | Инструменты
+research-discipline-tsfmc-equipment = ТСФ | Снаряжение
+research-discipline-tsfmc-shipyard = ТСФ | Судостроение
+
+# T1 ТСФ
+research-technology-tsfmc-guns = Базовое вооружение ТСФ
+research-technology-tsfmc-forensics = Работа с макроэлектроникой
+research-technology-tsfmc-portable-recharger = Портативное хранение энергии
+research-technology-tsfmc-basic-module = Разработка базовых модулей киборгов ТСФ
+research-technology-tsfmc-tier-one-vouchers = Базовое судостроение ТСФ
+research-technology-tsfmc-basic-equipment = Базовое снаряжение ТСФ
+
+# T2 ТСФ
+research-technology-tsfmc-advanced-weapons = Продвинутое вооружение ТСФ
+research-technology-tsfmc-nanofoam = Нано-пенообразование
+research-technology-tsfmc-eshield = Концентрация плазмы
+research-technology-tsfmc-advanced-meds = Регенеративные технологии
+research-technology-tsfmc-tier-two-vouchers = Продвинутое судостроение ТСФ
+research-technology-tsfmc-advanced-equipment = Продвинутое снаряжение ТСФ
+research-technology-tsfmc-mopp-equipment = Средства химической защиты ТСФ
+
+# T3 ТСФ
+research-technology-tsfmc-tier-three-vouchers = Глобальное судостроение ТСФ
+research-technology-tsfmc-super-weapons = Современное вооружение ТСФ
+research-technology-tsfmc-synthalloy = Экспериментальное материаловедение
+research-technology-tsfmc-advanced-module = Разработка продвинутых модулей киборгов ТСФ
+research-technology-tsfmc-experimental-equipment = Экспериментальное снаряжение ТСФ
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_Mono/research/ussp-research.ftl b/Resources/Locale/ru-RU/_Mono/research/ussp-research.ftl
index de737d4260f..6f9d264b5bc 100644
--- a/Resources/Locale/ru-RU/_Mono/research/ussp-research.ftl
+++ b/Resources/Locale/ru-RU/_Mono/research/ussp-research.ftl
@@ -1,21 +1,9 @@
-research-discipline-ussp = Исследования USSP
+research-discipline-ussp = Исследования СССП
 
-# T1 СССП
-research-technology-ussp-guns-basic = СССП Базовое вооружение
-research-technology-ussp-ships-basic = СССП Шаттлы Т-1
-research-technology-ussp-suits-basic = СССП Базовые скафандры
-research-technology-ussp-explosives-basic = СССП Взрывчатка
-
-# T2 СССП
-research-technology-ussp-guns-medium = СССП Стандартное вооружение
-research-technology-ussp-guns-ak410 = Программа AK-410
-research-technology-ussp-ships-medium = СССП Шаттлы Т-2
-research-technology-ussp-suits-medium = СССП Стандартное снаряжение
-research-technology-ussp-explosives-medium = СССП Боевая взрывчатка
-
-# T3 СССП
-research-technology-ussp-guns-advanced = СССП Продвинутое вооружение
-research-technology-ussp-ships-advanced = СССП Шаттлы Т-3
-research-technology-ussp-ships-ledokol = СССП Ледокол
-research-technology-ussp-suits-advanced = СССП Продвинутое снаряжение
-research-technology-ussp-ammo-advanced = СССП Продвинутые боеприпасы
+research-technology-ussp-suits-basic = Базовые скафандры СССП
+research-technology-ussp-guns-medium = Производство специального вооружения
+research-technology-ussp-guns-ak410 = Производство дозвукового вооружения
+research-technology-ussp-explosives-medium = Специализированная взрывчатка
+research-technology-ussp-suits-medium = Боевые скафандры СССП
+research-technology-ussp-guns-advanced = Производство тяжёлого вооружения
+research-technology-ussp-suits-advanced = МОДы СССП
diff --git a/Resources/Locale/ru-RU/cargo/bounties.ftl b/Resources/Locale/ru-RU/cargo/bounties.ftl
index a465c9a43c5..503c929fd83 100644
--- a/Resources/Locale/ru-RU/cargo/bounties.ftl
+++ b/Resources/Locale/ru-RU/cargo/bounties.ftl
@@ -104,7 +104,7 @@ bounty-description-soup = Чтобы подавить восстание без
 bounty-description-spear = Служба безопасности УСФ переживает сокращение бюджета. Вам заплатят, если вы доставите набор копий.
 bounty-description-syringe = Группе NT по борьбе с наркотиками нужны шприцы, чтобы распространять их среди малообеспеченных слоёв населения. Помогите некоторым людям сохранить работу.
 bounty-description-toolbox = В Центральном командовании не хватает робастности. Поторопитесь и поставьте несколько ящиков с инструментами в качестве решения проблемы.
-bounty-description-tech-disk = Новый научный ассистент на космической станции 15 пролил газировку на сервер РНД. Отправьте им несколько технологических дисков, чтобы они могли восстановить свои рецепты.
+bounty-description-tech-disk = Новый научный ассистент на космической станции 15 пролил газировку на РнД-сервер Отправьте им несколько технологических дисков, чтобы они могли восстановить свои рецепты.
 bounty-description-trash = Недавно у группы уборщиков закончился мусор для уборки, а без мусора УСФ хочет уволить их, чтобы сократить расходы. Отправьте партию мусора, чтобы сохранить им работу, и они дадут вам небольшую компенсацию.
 bounty-description-anomaly-core = Внезапно у нас закончились ядра аномалий, даже инертные атомные. Пришлите нам любые ядра аномалий, чтобы мы могли продолжать наблюдать за процессом их окончательного распада.
 bounty-description-borg-module = Учёные на соседней станции занимались только производством киборгов, но не модулей. Их исследования зашли в тупик, и им необходимы образцы для изучения. Пришлите любые модули киборгов, чтобы вдохновить своих коллег.
diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl
index fc05e7fa00a..88f0eaee02b 100644
--- a/Resources/Locale/ru-RU/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/research/technologies.ftl
@@ -1,9 +1,10 @@
 research-discipline-none = Отсутствует
 research-discipline-industrial = Промышленность
-research-discipline-biochemical = Биохимия
+research-discipline-biochemical = Медицина
 research-discipline-arsenal = Арсенал
-research-discipline-experimental = Экспериментальное
-research-discipline-civilian-services = Обслуживание персонала
+research-discipline-experimental = Наука
+research-discipline-civilian-services = Сервис
+
 research-technology-fulton = Фултоны
 research-technology-salvage-equipment = Снаряжение для утилизации
 research-technology-advanced-powercells = Продвинутые батареи
@@ -54,16 +55,16 @@ research-technology-super-parts = Суперкомпоненты
 research-technology-deterrence = Технология сдерживания
 research-technology-janitorial-equipment = Уборочное оборудование
 research-technology-laundry-tech = Прачечная технология
-research-technology-critter-mechs = Мехи для животных
+research-technology-critter-mechs = Производство механоидов для животных
 research-technology-basic-hydroponics = Основы гидропоники
 research-technology-food-service = Организация питания
 research-technology-advanced-entertainment = Продвинутые развлечения
 research-technology-robotic-cleanliness = Роботизированная уборка
 research-technology-faux-astro-tiles = Искусственная астроплитка
-research-technology-audio-visual-communication = А/В коммуникация
+research-technology-audio-visual-communication = А/В коммуникации
 research-technology-advanced-cleaning = Продвинутая уборка
 research-technology-meat-manipulation = Манипулирование мясом
-research-technology-honk-mech = Мех Х.О.Н.К.
+research-technology-honk-mech = Механоид Х.О.Н.К.
 research-technology-advanced-spray = Продвинутые спреи
 research-technology-quantum-fiber-weaving = Плетение квантового волокна
 research-technology-bluespace-cargo-transport = Блюспейс-транспортировка грузов
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/objects/specific/science/techdisks/tech_disks_science.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/objects/specific/science/techdisks/tech_disks_science.ftl
new file mode 100644
index 00000000000..57021910122
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_LuaM/entities/objects/specific/science/techdisks/tech_disks_science.ftl
@@ -0,0 +1,2 @@
+ent-TechDiskDataFarm = технодиск фермы данных
+    .desc = Диск, добавляющий машииную плату фермы данных в список рецептов сервера.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/devices/flatpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/devices/flatpack.ftl
index 3292926721a..0e2477d910d 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/devices/flatpack.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/devices/flatpack.ftl
@@ -22,7 +22,7 @@ ent-MassMediaFlatpack = упакованная консоль управлени
     .desc = Набор для сборки консоли управления новостями.
 ent-AtmosDeviceFanDirectionalFlatpack = упакованный направленный вентилятор
     .desc = Набор для сборки направленного вентилятора.
-ent-RDServerUSSPFlatpack = упакованный сервер РнД-сервер СССП.
+ent-RDServerUSSPFlatpack = упакованный РнД-сервер СССП
     .desc = Набор для сборки РнД-сервера СССП.
 ent-RDServerRogueFlatpack = упакованный РнД-сервер Авангарда
     .desc = Набор для сборки РнД-сервера Авангарда.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/electronics/datafarms.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/electronics/datafarms.ftl
index 3f6df65fcc0..4939689458f 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/electronics/datafarms.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/electronics/datafarms.ftl
@@ -1,6 +1,6 @@
-ent-DataFarmCryptoCircuitboard = ферма данных (машинная плата)
-    .desc = Печатная плата для фермы данных.
-    .suffix =  { ent-BaseMachineCircuitboard.suffix }
-ent-DataFarmResearchCircuitboard = криптоферма (машинная плата)
+ent-DataFarmCryptoCircuitboard = криптоферма (машинная плата)
     .desc = Печатная плата для криптофермы.
     .suffix =  { ent-BaseMachineCircuitboard.suffix }
+ent-DataFarmResearchCircuitboard = ферма данных (машинная плата)
+    .desc = Печатная плата для фермы данных.
+    .suffix =  { ent-BaseMachineCircuitboard.suffix }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/structures/machines/datafarms.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/structures/machines/datafarms.ftl
index 7958a918205..275ef32dada 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/structures/machines/datafarms.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/structures/machines/datafarms.ftl
@@ -1,6 +1,6 @@
 ent-DatafarmResearch = ферма данных
-    .desc = Энергоёмкий сервер, предназначенный для извлечения данных… откуда-то. Генерирует 20 исследовательских очков в секунду.
+    .desc = Энергоёмкий сервер, предназначенный для извлечения данных… откуда-то. Генерирует 10 исследовательских очков в секунду.
 ent-DatafarmResearchFaction = продвинутая ферма данных
-    .desc = { ent-DatafarmResearch.desc } Похоже, он прикручен к полу.
+    .desc = Энергоёмкий сервер, предназначенный для извлечения данных… откуда-то. Генерирует 50 исследовательских очков в секунду. Похоже, он прикручен к полу.
 ent-DatafarmCrypto = криптоферма
     .desc = Энергоёмкий сервер, предназначенный для извлечения данных… откуда-то. Генерирует ценную, но случайную криптовалюту со скоростью одной единицы каждые 10 минут.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/structures/machines/faction_servers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/structures/machines/faction_servers.ftl
index 7cdac899382..241f7789a96 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/structures/machines/faction_servers.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_Mono/entities/structures/machines/faction_servers.ftl
@@ -6,7 +6,7 @@ ent-ResearchAndDevelopmentServerRogues = РнД-сервер Авангарда
     .desc = Содержит совокупные знания учёных Синдиката этого сектора.
 ent-ResearchAndDevelopmentServerUssp = РнД-сервер СССП
     .desc = Содержит совокупные знания всех учёных СССП этого сектора.
-ent-ResearchAndDevelopmentServerDebug = сервер-РнД
+ent-ResearchAndDevelopmentServerDebug = РнД-сервер
     .suffix = ДЕБАГ
     .desc = Содержит совокупные знания всех. Да, вообще всех.
 ent-ResearchAndDevelopmentServerMerc = РнД-сервер наёмников
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl
index 1099db94e04..f519e4986c4 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/objects/devices/flatpacks.ftl
@@ -107,8 +107,8 @@ ent-ComputerCrewMonitoringFlatpack = упакованная консоль мо
     .desc = Упаковка, при помощи которой можно создать консоль мониторинга экипажа
 ent-ComputerIFFFlatpack = упакованная консоль системы опознавания
     .desc = Упаковка, при помощи которой можно создать консоль системы опознавания.
-ent-ResearchAndDevelopmentServerFlatpack = упакованный сервер РНД
-    .desc = Упаковка, при помощи которой можно создать сервер РНД
+ent-ResearchAndDevelopmentServerFlatpack = упакованный РнД-сервер
+    .desc = Упаковка, при помощи которой можно создать РнД-сервер.
 ent-TelecomServerFlatpack = упакованный телекомуникационный сервер
     .desc = Упаковка, при помощи которой можно создать телекомуникационный сервер.
 ent-AirlockFlatpack = упакованный воздушный шлюз
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
index c15b5ccace8..57adb5b19df 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl
@@ -20,7 +20,7 @@ ent-CircuitImprinterHyperConvectionMachineCircuitboard = гиперконвек
     .desc = Печатная плата гиперконвекционного принтера схем.
 ent-ExosuitFabricatorMachineCircuitboard = фабрикатор экзокостюмов (машинная плата)
     .desc = { ent-BaseMachineCircuitboard.desc }
-ent-ResearchAndDevelopmentServerMachineCircuitboard = сервер РнД (машинная плата)
+ent-ResearchAndDevelopmentServerMachineCircuitboard = РнД-сервер (машинная плата)
     .desc = Машинная плата для сервера РнД.
 ent-UniformPrinterMachineCircuitboard = принтер униформы (машинная плата)
     .desc = { ent-BaseMachineCircuitboard.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/research.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/research.ftl
index e64349a2d8a..708b9390cbf 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/research.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/research.ftl
@@ -1,4 +1,4 @@
-ent-ResearchAndDevelopmentServer = сервер РнД
+ent-ResearchAndDevelopmentServer = РнД-сервер
     .desc = Содержит коллективные знания учёных станции. Уничтожение его отправит их обратно в каменный век. Вы же не хотите этого?
 ent-BaseResearchAndDevelopmentPointSource = базовый источник очков РнД
     .desc = { ent-BaseMachinePowered.desc }
diff --git a/Resources/Maps/_LuaM/POI/camelotLuaM.yml b/Resources/Maps/_LuaM/POI/camelotLuaM.yml
index 00314d9c71d..241b1b460e7 100644
--- a/Resources/Maps/_LuaM/POI/camelotLuaM.yml
+++ b/Resources/Maps/_LuaM/POI/camelotLuaM.yml
@@ -55171,7 +55171,7 @@ entities:
       parent: 1
     - type: DeltaPressure
       gridUid: 1
-- proto: ResearchAndDevelopmentServerUssp
+- proto: ResearchAndDevelopmentServer
   entities:
   - uid: 8556
     components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index a9c0b9710e1..2d61955e6d0 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -273,6 +273,7 @@
     - SmartGun # Goobstation
     # Einstein Engines Packs
     - Translators
+    - ZookeeperTranslatorImplant # LuaM
   - type: EmagLatheRecipes
     emagDynamicPacks:
     - DynamicAmmoRecipePack
@@ -347,6 +348,7 @@
     - S2MechBoards
     - EngineeringBoardsGoob #Goob Factorio port
     - ReactorCircuitboards # FH edit
+    - DataFarmResearchCircuitboard # LuaM
   - type: MaterialStorage
     whitelist:
       tags:
@@ -629,6 +631,7 @@
     - CyberLiver
     - CyberOrgans
     - UpgradedCyberOrgans
+    - AdvMeds
     # LuaM-end.
   - type: Machine
     board: MedicalTechFabCircuitboard
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
index b9370cc9178..572014454ae 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/science.yml
@@ -99,7 +99,7 @@
   - APECircuitboard
   - ArtifactAnalyzerMachineCircuitboard
   - ArtifactCrusherMachineCircuitboard
-  - DataFarmResearchCircuitboard
+#  - DataFarmResearchCircuitboard # Commented by LuaM
 
 - type: latheRecipePack
   id: CameraBoards
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 8ccb75c8d35..67be0f78b11 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -35,8 +35,8 @@
   - WeaponLaserSvalinn # Mono
   - NFBlueprintWeaponLaserSvalinn # Frontier
   technologyPrerequisites:
-  - BasicParts
-  position: 2, 3
+  - AdvancedRiotControl # LuaM: BasicParts > AdvancedRiotControl
+  position: 11, 12
 
 # Mono edit - research consolidation
 # - type: technology
@@ -70,7 +70,7 @@
   - ClothingBackpackElectropack # Mono
   technologyPrerequisites:
   - BasicParts
-  position: 2, 2
+  position: 7, 13
 
 - type: technology
   id: ExplosiveTechnology
@@ -89,8 +89,9 @@
   - ChemicalPayload
   - NFBlueprintSignallerAdvanced # Frontier
   technologyPrerequisites:
-  - SuperParts
-  position: 1, 14
+  - AdvancedParts # LuaM: SuperParts > AdvancedParts
+  - WeaponizedLaserManipulation # LuaM
+  position: 10, 11
 
 # Mono edit - research consolidation
 # - type: technology
@@ -121,7 +122,7 @@
   - WeaponXrayCannon # Mono
   technologyPrerequisites:
   - WeaponizedLaserManipulation
-  position: 3, 3
+  position: 11, 10
 
 # - type: technology
 #   id: WaveParticleHarnessing
@@ -160,7 +161,7 @@
   - PowerCageHigh
   technologyPrerequisites:
   - ExplosiveTechnology
-  position: -5, 8
+  position: 10, 9
 
 # Tier 3
 
@@ -179,7 +180,7 @@
   technologyPrerequisites:
   - ConcentratedLaserWeaponry
   - SuperParts
-  position: 4, 3
+  position: 11, 8
 
 # Mono edit - research consolidation
 # - type: technology
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 4680df067be..84a23cb850c 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -6,17 +6,17 @@
   entityIcon: hydroponicsTray
   discipline: CivilianServices
   tier: 1
-  cost: 5000
+  cost: 10000 # LuaM: 5000 > 10000
   recipeUnlocks:
-  - BorgModuleGardening
-  - BorgModuleHarvesting
-  - PlantBagOfHolding
+#  - BorgModuleGardening # Commented by LuaM
+#  - BorgModuleHarvesting # Commented by LuaM
+#  - PlantBagOfHolding # Commented by LuaM
   - SeedExtractorMachineCircuitboard
   - HydroponicsTrayMachineCircuitboard
   - ReagentGrinderIndustrialMachineCircuitboard
-  - PlantAnalyzer # Frontier
-  - NFBlueprintPlantAnalyzer # Frontier
-  - NFBlueprintPlantBagOfHolding # Frontier
+#  - PlantAnalyzer # Frontier # Commented by LuaM
+#  - NFBlueprintPlantAnalyzer # Frontier # Commented by LuaM
+#  - NFBlueprintPlantBagOfHolding # Frontier # Commented by LuaM
   # Mono edit start
   - FauxTileAstroGrass
   - FauxTileMowedAstroGrass
@@ -25,16 +25,16 @@
   - FauxTileAstroSnow
   - FauxTileAstroAsteroidSand
   technologyPrerequisites:
-  - BasicParts
-  position: 3, -1
+  - FoodService # LuaM: BasicParts > FoodService
+  position: 4, 12
 
 - type: technology
   id: CritterMechs
   name: research-technology-critter-mechs
   entityIcon: MechHamtrBattery
-  discipline: CivilianServices
+  discipline: MechaEngineering # LuaM: CivilianServices > MechaEngineering
   tier: 1
-  cost: 5000
+  cost: 15000 # LuaM: 5000 > 15000
   recipeUnlocks:
   - HamtrHarness
   - HamtrLArm
@@ -47,7 +47,7 @@
   - VimHarness
   technologyPrerequisites:
   - MechBasic
-  position: 3, 10
+  position: 6, 12
 
 - type: technology
   id: AudioVisualCommunication
@@ -74,7 +74,7 @@
   # Mono edit end
   technologyPrerequisites:
   - BasicParts
-  position: 2, -2
+  position: 6, 13
 
 # Mono edit - research consolidation
 # - type: technology
@@ -159,7 +159,7 @@
   - SyringeCryostasis
   technologyPrerequisites:
   - IndustrialMedicine
-  position: -4, 11
+  position: 8, 10
 
 # Shitmed Change Start
 - type: technology
@@ -180,8 +180,8 @@
   - DefibrillatorCompact # Mono
   technologyPrerequisites:
   - SuperParts
-  - IndustrialMedicine
-  position: -2, 11
+  - BiochemicalStasis # LuaM: IndustrialMedicine > BiochemicalStasis
+  position: 7, 9
 
 - type: technology
   id: CyberneticEnhancements
@@ -203,7 +203,7 @@
   - DiagnosticCyberneticEyes # LuaM
   technologyPrerequisites:
   - AdvancedTreatment
-  position: -2, 12
+  position: 6, 8
 # Shitmed Change End
 
 # Mono edit
@@ -224,16 +224,16 @@
   - ClothingBackpackWaterTank
   - JanicartFlatpack
   technologyPrerequisites:
-  - BasicParts
-  position: 2, -3
+  - AdvancedParts # LuaM: BasicParts > AdvancedParts
+  position: 2, 11
 
 - type: technology
   id: HONKMech
   name: research-technology-honk-mech
   entityIcon: MechHonkerFilled
-  discipline: CivilianServices
+  discipline: MechaEngineering # LuaM: CivilianServices > MechaEngineering
   tier: 2
-  cost: 15000
+  cost: 25000 # LuaM: 15000 > 25000
   recipeUnlocks:
   - HonkerHarness
   - HonkerLArm
@@ -248,7 +248,7 @@
   - MechEquipmentHonkerMousetrapMortar
   technologyPrerequisites:
   - CritterMechs
-  position: 4, 10
+  position: 6, 10
 
 # Mono edit - research consolidation
 # - type: technology
@@ -309,6 +309,6 @@
   - NFBlueprintJugBluespace # Frontier
   - NFBlueprintVialBluespace # Frontier
   technologyPrerequisites:
-  - SuperParts
+#  - SuperParts # Commented by LuaM
   - BiochemicalStasis
-  position: -4, 12
+  position: 8, 8
diff --git a/Resources/Prototypes/Research/disciplines.yml b/Resources/Prototypes/Research/disciplines.yml
index b993de00945..d97bb6e0442 100644
--- a/Resources/Prototypes/Research/disciplines.yml
+++ b/Resources/Prototypes/Research/disciplines.yml
@@ -9,7 +9,7 @@
     1: 0
     2: 0.75
     3: 0.75
-  uiName: IND  # Goobstation
+  uiName: research-discipline-industrial # Goobstation # LuaM: IND > research-discipline-industrial
 
 - type: techDiscipline
   id: Arsenal
@@ -22,7 +22,7 @@
     1: 0
     2: 0.75
     3: 0.75
-  uiName: SEC  # Goobstation
+  uiName: research-discipline-arsenal  # Goobstation # LuaM: SEC > research-discipline-arsenal
 
 - type: techDiscipline
   id: Experimental
@@ -35,7 +35,7 @@
     1: 0
     2: 0.75
     3: 0.75
-  uiName: EXP  # Goobstation
+  uiName: research-discipline-experimental # Goobstation # LuaM: EXP > research-discipline-experimental
 
 - type: techDiscipline
   id: CivilianServices
@@ -48,4 +48,4 @@
     1: 0
     2: 0.75
     3: 0.75
-  uiName: SRV  # Goobstation
+  uiName: research-discipline-civilian-services  # Goobstation # LuaM: SRV > research-discipline-civilian-services
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index 5667029623d..1a10e6abb36 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -54,12 +54,12 @@
   entityIcon: ComputerTechnologyDiskTerminal
   discipline: Experimental
   tier: 1
-  cost: 5000
+  cost: 25000 # LuaM: 5000 > 25000
   recipeUnlocks:
   - TechDiskComputerCircuitboard
   technologyPrerequisites:
   - BasicParts
-  position: 1, -6
+  position: 7, 12
 
 - type: technology
   id: MagnetsTech
@@ -72,8 +72,8 @@
   - ClothingShoesBootsMagSci
   - NFClothingShoesBootsMoon # Frontier ClothingShoesBootsMoon<NFClothingShoesBootsMoon
   technologyPrerequisites:
-  - BasicParts
-  position: -2, -1
+  - AdvancedParts # LuaM: BasicParts > AdvancedParts
+  position: 6, 7
 
 # Mono edit - research consolidation
 # - type: technology
@@ -105,7 +105,7 @@
   - NanoManipulatorStockPart
   technologyPrerequisites:
   - BasicParts
-  position: 0, 9
+  position: 8, 7
 
 # Mono edit - research consolidation
 # - type: technology
@@ -144,13 +144,13 @@
   entityIcon: HoloprojectorField
   discipline: Experimental
   tier: 2
-  cost: 10000
+  cost: 7500 # LuaM: 10000 > 7500
   recipeUnlocks:
   # - WeaponParticleDecelerator # Frontier - Cancer gun that skip walls
   - HoloprojectorField
   technologyPrerequisites:
   - BasicParts
-  position: 2, -1
+  position: 4, 13
 
 - type: technology
   id: AiTechnology
@@ -163,7 +163,7 @@
   - AiCoreElectronics
   technologyPrerequisites:
   - SuperParts
-  position: -4, 18
+  position: 8, 2
 
 # Tier 3
 
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index cef7b291922..41a8a448471 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -26,7 +26,7 @@
   - MechEquipmentKineticAccelerator # Goobstation
   technologyPrerequisites:
   - BasicParts
-  position: -1, 1
+  position: 4, 13
 
 - type: technology
   id: SpaceScanning
@@ -40,8 +40,8 @@
   - HandHeldMassScanner
   - BorgModuleGPS
   technologyPrerequisites:
-  - BasicParts
-  position: -2, 0
+  - SalvageEquipment # LuaM: BasicParts > SalvageEquipment
+  position: 3, 12
 
 # - type: technology
 #   id: AdvancedPowercells
@@ -76,7 +76,7 @@
   - NFBlueprintRped
   technologyPrerequisites:
   - AdvancedParts
-  position: -1, 8
+  position: 1, 11
 # Mono edit end
 
 - type: technology
@@ -106,7 +106,7 @@
   - SheetifierMachineCircuitboard
   technologyPrerequisites:
   - MechanicalCompression
-  position: -1, 7
+  position: 2, 10
 
 # Mono edit
 - type: technology
@@ -134,7 +134,8 @@
   - PowerCageRechargerCircuitboard # Mono
   technologyPrerequisites:
   - AdvancedParts
-  position: -2, 8
+  - SpaceScanning
+  position: 13, 10
 
 - type: technology
   id: AtmosphericTech
@@ -148,8 +149,8 @@
   - GasRecyclerMachineCircuitboard
   - FanElectronics # LuaM
   technologyPrerequisites:
-  - BasicParts
-  position: -2, 1
+  - PowerGeneration # LuaM: BasicParts > PowerGeneration
+  position: 14, 9
 
 # Tier 2
 
@@ -169,8 +170,12 @@
   - SmallThrusterMachineCircuitboard # Frontier
   - SmallGyroscopeMachineCircuitboard # Frontier
   technologyPrerequisites:
-  - AdvancedParts
-  position: -5, 7
+#  - AdvancedParts # Commented by LuaM
+# LuaM-start:
+  - SpaceScanning
+  - PowerGeneration
+# LuaM-end.
+  position: 6, 12
 
 - type: technology
   id: AdvancedAtmospherics
@@ -187,7 +192,7 @@
   #  - FireExtinguisherBluespace # DeltaV
   technologyPrerequisites:
   - AtmosphericTech
-  position: -2, 2
+  position: 14, 8
 
 - type: technology
   id: AdvancedToolsTechnology
@@ -195,7 +200,7 @@
   entityIcon: WelderExperimental
   discipline: Industrial
   tier: 2
-  cost: 23500
+  cost: 25000 # LuaM: 23500 > 25000
   recipeUnlocks:
   - WelderExperimental
   - PowerDrill
@@ -218,8 +223,9 @@
   - NFBlueprintRCDAmmo
   # Mono edit end 
   technologyPrerequisites:
-  - SuperParts
-  position: -1, 18
+  - SuperParts 
+  - MassExcavation # LuaM
+  position: 4, 6
 
 - type: technology
   id: MassExcavation
@@ -227,7 +233,7 @@
   entityIcon: MiningDrillDiamond
   discipline: Industrial
   tier: 2
-  cost: 15000 # aint that good tbh.
+  cost: 25000 # aint that good tbh. # LuaM: 15000 > 25000
   recipeUnlocks:
   - OreBagOfHolding
   - MiningDrillDiamond
@@ -238,9 +244,9 @@
   - BorgModuleAdvancedMining # Frontier
   - MechEquipmentDrillDiamond
   technologyPrerequisites:
-  - SalvageEquipment
+  - SpaceScanning # LuaM: SalvageEquipment > SpaceScanning
   - AdvancedParts
-  position: -1, 2
+  position: 4, 11
 
 # Tier 3
 
@@ -279,7 +285,7 @@
   technologyPrerequisites:
   - PowerGeneration
   - SuperParts
-  position: -2, 7
+  position: 12, 7
 
 # Mono edit - research consolidation
 # - type: technology
diff --git a/Resources/Prototypes/_DV/Research/civilianservices.yml b/Resources/Prototypes/_DV/Research/civilianservices.yml
index 2561a7498fd..77cdc3f2f28 100644
--- a/Resources/Prototypes/_DV/Research/civilianservices.yml
+++ b/Resources/Prototypes/_DV/Research/civilianservices.yml
@@ -10,4 +10,4 @@
     - MiniSyringe
   technologyPrerequisites:
   - IndustrialMedicine
-  position: -5, 11
+  position: 9, 11
diff --git a/Resources/Prototypes/_FarHorizons/Research/industrial.yml b/Resources/Prototypes/_FarHorizons/Research/industrial.yml
index 4cd7d64c3c5..580ca4899f2 100644
--- a/Resources/Prototypes/_FarHorizons/Research/industrial.yml
+++ b/Resources/Prototypes/_FarHorizons/Research/industrial.yml
@@ -4,7 +4,7 @@
   entityIcon: NuclearReactorSmall # Mono
   discipline: Industrial
   tier: 1
-  cost: 7500
+  cost: 75000 # LuaM: 7500 > 75000
   recipeUnlocks:
   - NuclearFabricatorMachineCircuitboard
   - NuclearReactorMonitorComputerCircuitboard
@@ -23,10 +23,10 @@
   - PlasmaGlassReactorHeatExchanger
   technologyPrerequisites:
   - PowerGeneration
-  - AdvancedParts # Mono
+  - SuperParts # Mono # LuaM: AdvancedParts > SuperParts
   #radioChannels:
   #- Engineering
-  position: -3, 4 # Mono
+  position: 13, 6 # Mono
 
 - type: technology
   id: NuclearPowerRecycling
@@ -34,7 +34,7 @@
   entityIcon: NuclearCentrifuge # Mono
   discipline: Industrial
   tier: 2
-  cost: 12500
+  cost: 50000 # LuaM: 12500 > 50000
   recipeUnlocks:
   - NuclearCentrifugeMachineCircuitboard
   - PlutoniumReactorFuelRod
@@ -49,4 +49,4 @@
   - NuclearPowerGeneration
   #radioChannels:
   #- Engineering
-  position: -3, 5 # Mono
+  position: 14, 6 # Mono
diff --git a/Resources/Prototypes/_Goobstation/Research/arsenal.yml b/Resources/Prototypes/_Goobstation/Research/arsenal.yml
index 5121bc410b8..75174edbe0f 100644
--- a/Resources/Prototypes/_Goobstation/Research/arsenal.yml
+++ b/Resources/Prototypes/_Goobstation/Research/arsenal.yml
@@ -11,5 +11,6 @@
   - MagazineSmartLMG
   - ASMGTUniversallyHostile
   technologyPrerequisites:
-  - BasicParts
-  position: 2, 4
+  - SuperParts # LuaM: BasicParts > SuperParts
+  - MercArmementAdvanced # LuaM
+  position: 13, 9
diff --git a/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks/tech_disks_science.yml b/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks/tech_disks_science.yml
new file mode 100644
index 00000000000..2f9660e128d
--- /dev/null
+++ b/Resources/Prototypes/_LuaM/Entities/Objects/Specific/Science/TechDisks/tech_disks_science.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: TechDiskBase
+  id: TechDiskDataFarm
+  name: data farm circuitboard tech disk
+  description: A disk capable data farm research circuitboard of adding to a server's recipes.
+  suffix: DO NOT MAP
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+      map: ["enum.DamageStateVisualLayers.Base"]
+      color: "#d4d4d4"
+    - state: label
+    - state: protect
+    - state: holo
+      shader: unshaded
+  - type: TechnologyDisk
+    recipes:
+    - DataFarmResearchCircuitboard
\ No newline at end of file
diff --git a/Resources/Prototypes/_LuaM/Recipes/Lathes/Factions/melee_weapons.yml b/Resources/Prototypes/_LuaM/Recipes/Lathes/Factions/melee_weapons.yml
new file mode 100644
index 00000000000..f91521e30e5
--- /dev/null
+++ b/Resources/Prototypes/_LuaM/Recipes/Lathes/Factions/melee_weapons.yml
@@ -0,0 +1,4 @@
+- type: latheRecipe
+  parent: EnergySwordRogue
+  id: EnergySwordTSF
+  result: EnergySwordNfsd
\ No newline at end of file
diff --git a/Resources/Prototypes/_LuaM/Recipes/Lathes/Factions/misc.yml b/Resources/Prototypes/_LuaM/Recipes/Lathes/Factions/misc.yml
new file mode 100644
index 00000000000..d7895390b25
--- /dev/null
+++ b/Resources/Prototypes/_LuaM/Recipes/Lathes/Factions/misc.yml
@@ -0,0 +1,4 @@
+- type: latheRecipe
+  parent: HyposprayRogue
+  id: Hypospray
+  result: Hypospray
\ No newline at end of file
diff --git a/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/arsenal.yml b/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/arsenal.yml
new file mode 100644
index 00000000000..e3278932730
--- /dev/null
+++ b/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/arsenal.yml
@@ -0,0 +1,40 @@
+- type: latheRecipePack
+  id: ArmorBasic
+  recipes:
+  - ClothingOuterVestWebMercenaryBlack
+  - ClothingOuterVestWebMercenary
+  - ClothingOuterArmorBasic
+  - ClothingOuterArmorBasicSlim
+  - ClothingHeadHelmetMercenary
+  - ClothingHeadHelmetMercenaryBlack
+  - ClothingHeadHelmetBasic
+
+- type: latheRecipePack
+  id: ArmorAdvanced
+  recipes:
+  - ClothingOuterArmorBulletproofNF
+  - ClothingOuterArmorRiot
+  - ClothingOuterArmorReflective
+  - ClothingOuterCoatBHTrench
+  - ClothingHeadHelmetRiot
+
+- type: latheRecipePack
+  id: PunkGear
+  recipes:
+  - ClothingEyesPunkInfoShades
+  - ClothingOuterArmorPunkRandomized
+  - ClothingOuterArmorPunkRed
+  - ClothingOuterArmorPunkGreen
+  - ClothingOuterArmorPunkOrange
+  - ClothingOuterArmorElitePunkRandomized
+  - ClothingBeltPunkRandomized
+  - ClothingShoesBootsPunkRandomized
+  - ClothingEyesPunkGoggles
+  - ClothingEyesPunkInfoShades
+  - ClothingMaskPunkHalf
+  - ClothingUniformRandomPunkTanktop
+  - ClothingUniformRandomPunkTanktopShorts
+  - ClothingUniformRandomPunkCroptop
+  - ClothingUniformRandomPunkCroptopShorts
+  - ClothingOuterCoatLettermanRandomized
+  - ClothingOuterCoatBomberRandomized
\ No newline at end of file
diff --git a/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/medical.yml
new file mode 100644
index 00000000000..9519f69a59c
--- /dev/null
+++ b/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/medical.yml
@@ -0,0 +1,5 @@
+- type: latheRecipePack
+  id: AdvMeds
+  recipes:
+  - SutureTSF
+  - MeshTSF
\ No newline at end of file
diff --git "a/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/\321\201ircuitboard.yml" "b/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/\321\201ircuitboard.yml"
new file mode 100644
index 00000000000..a04b083d132
--- /dev/null
+++ "b/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/\321\201ircuitboard.yml"
@@ -0,0 +1,4 @@
+- type: latheRecipePack
+  id: DataFarmResearchCircuitboard
+  recipes:
+  - DataFarmResearchCircuitboard
\ No newline at end of file
diff --git a/Resources/Prototypes/_LuaM/Recipes/Lathes/clothing-armor.yml b/Resources/Prototypes/_LuaM/Recipes/Lathes/clothing-armor.yml
new file mode 100644
index 00000000000..c7edefc1711
--- /dev/null
+++ b/Resources/Prototypes/_LuaM/Recipes/Lathes/clothing-armor.yml
@@ -0,0 +1,55 @@
+# Outer
+- type: latheRecipe
+  id: ClothingOuterArmorBasic
+  parent: NFBaseArmorRecipe
+  result: ClothingOuterArmorBasic
+  materials:
+    Durathread: 350
+    Steel: 500
+    Plasteel: 300
+
+- type: latheRecipe
+  id: ClothingOuterArmorBasicSlim
+  parent: NFBaseArmorRecipe
+  result: ClothingOuterArmorBasicSlim
+  materials:
+    Durathread: 350
+    Steel: 500
+    Plasteel: 300
+
+- type: latheRecipe
+  id: ClothingOuterArmorRiot
+  parent: NFBaseArmorRecipe
+  result: ClothingOuterArmorRiot
+  materials:
+    Durathread: 500
+    Steel: 900
+    Plasteel: 400
+    Plastic: 400
+
+- type: latheRecipe
+  id: ClothingOuterArmorReflective
+  parent: NFBaseArmorRecipe
+  result: ClothingOuterArmorReflective
+  materials:
+    Durathread: 200
+    Glass: 1000
+    Plastic: 500
+    Steel: 250
+    Plasteel: 250
+
+# Helmets
+- type: latheRecipe
+  id: ClothingHeadHelmetMercenaryBlack
+  parent: NFBaseHelmetRecipe
+  result: ClothingHeadHelmetMercenaryBlack
+
+- type: latheRecipe
+  id: ClothingHeadHelmetRiot
+  parent: NFBaseHelmetRecipe
+  result: ClothingHeadHelmetRiot
+  materials:
+    Cloth: 100
+    Durathread: 100
+    Steel: 250
+    Plastic: 850
\ No newline at end of file
diff --git a/Resources/Prototypes/_LuaM/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_LuaM/Recipes/Lathes/electronics.yml
new file mode 100644
index 00000000000..cf5aff4527e
--- /dev/null
+++ b/Resources/Prototypes/_LuaM/Recipes/Lathes/electronics.yml
@@ -0,0 +1,4 @@
+- type: latheRecipe
+  parent: BaseGoldCircuitboardRecipe
+  id: DataFarmCryptoCircuitboard
+  result: DataFarmCryptoCircuitboard
\ No newline at end of file
diff --git a/Resources/Prototypes/_LuaM/Research/TSFMC/tsf_misc.yml b/Resources/Prototypes/_LuaM/Research/TSFMC/tsf_misc.yml
new file mode 100644
index 00000000000..6447b956c62
--- /dev/null
+++ b/Resources/Prototypes/_LuaM/Research/TSFMC/tsf_misc.yml
@@ -0,0 +1,13 @@
+- type: technology
+  id: Hypospray
+  name: research-technology-rogue-hypospray
+  entityIcon: Hypospray
+  discipline: TsfmcGear
+  tier: 2
+  cost: 25000
+  recipeUnlocks:
+  - Hypospray
+  technologyPrerequisites:
+  - UniversalMaterialResearchT1
+  - AdvancedTreatment # LuaM
+  position: 10, 13
\ No newline at end of file
diff --git a/Resources/Prototypes/_LuaM/Research/arsenal.yml b/Resources/Prototypes/_LuaM/Research/arsenal.yml
new file mode 100644
index 00000000000..69b71827449
--- /dev/null
+++ b/Resources/Prototypes/_LuaM/Research/arsenal.yml
@@ -0,0 +1,64 @@
+- type: technology
+  id: ArmorBasic
+  name: research-technology-armor-basic
+  entityIcon: ClothingOuterArmorBasic
+  discipline: Arsenal
+  tier: 1
+  cost: 8500
+  recipeUnlocks:
+  - ClothingOuterVestWebMercenaryBlack
+  - ClothingOuterVestWebMercenary
+  - ClothingOuterArmorBasic
+  - ClothingOuterArmorBasicSlim
+  - ClothingHeadHelmetMercenary
+  - ClothingHeadHelmetMercenaryBlack
+  - ClothingHeadHelmetBasic
+  technologyPrerequisites:
+  - BasicParts
+  position: 2, 13
+
+- type: technology
+  id: ArmorAdvanced
+  name: research-technology-armor-advanced
+  entityIcon: ClothingOuterArmorBulletproof
+  discipline: Arsenal
+  tier: 2
+  cost: 15000
+  recipeUnlocks:
+  - ClothingOuterArmorBulletproofNF
+  - ClothingOuterArmorRiot
+  - ClothingOuterArmorReflective
+  - ClothingOuterCoatBHTrench
+  - ClothingHeadHelmetRiot
+  technologyPrerequisites:
+  - ArmorBasic
+  position: 2, 10
+
+- type: technology
+  id: PunkGear
+  name: research-technology-punk-gear
+  entityIcon: ClothingOuterCoatBomberPunkRed
+  discipline: Arsenal
+  tier: 1
+  cost: 12500
+  recipeUnlocks:
+  - ClothingEyesPunkInfoShades
+  - ClothingOuterArmorPunkRandomized
+  - ClothingOuterArmorPunkRed
+  - ClothingOuterArmorPunkGreen
+  - ClothingOuterArmorPunkOrange
+  - ClothingOuterArmorElitePunkRandomized
+  - ClothingBeltPunkRandomized
+  - ClothingShoesBootsPunkRandomized
+  - ClothingEyesPunkGoggles
+  - ClothingEyesPunkInfoShades
+  - ClothingMaskPunkHalf
+  - ClothingUniformRandomPunkTanktop
+  - ClothingUniformRandomPunkTanktopShorts
+  - ClothingUniformRandomPunkCroptop
+  - ClothingUniformRandomPunkCroptopShorts
+  - ClothingOuterCoatLettermanRandomized
+  - ClothingOuterCoatBomberRandomized
+  technologyPrerequisites:
+  - ArmorBasic
+  position: 1, 12
\ No newline at end of file
diff --git a/Resources/Prototypes/_LuaM/Research/civilianservices.yml b/Resources/Prototypes/_LuaM/Research/civilianservices.yml
index 750c71c61ea..3f0253db85a 100644
--- a/Resources/Prototypes/_LuaM/Research/civilianservices.yml
+++ b/Resources/Prototypes/_LuaM/Research/civilianservices.yml
@@ -1,3 +1,23 @@
+# Tier 2
+- type: technology
+  id: AdvancedHydroponics
+  name: research-technology-advanced-hydroponics
+  entityIcon: PlantAnalyzer
+  discipline: CivilianServices
+  tier: 2
+  cost: 25000
+  recipeUnlocks:
+  - PlantAnalyzer
+  - PlantBagOfHolding
+  - BorgModuleGardening
+  - BorgModuleHarvesting
+  - NFBlueprintPlantAnalyzer
+  - NFBlueprintPlantBagOfHolding
+  technologyPrerequisites:
+  - Hydroponics
+  - AdvancedParts
+  position: 4, 11
+
 # Tier 3
 - type: technology
   id: Implants
@@ -15,7 +35,7 @@
   - DexRightHand
   technologyPrerequisites:
   - CyberneticEnhancements
-  position: -2, 13
+  position: 6, 7
 
 - type: technology
   id: CyberneticOrgans
@@ -29,7 +49,7 @@
   - BasicCyberneticLungs
   technologyPrerequisites:
   - Implants
-  position: -2, 14
+  position: 6, 6
 
 - type: technology
   id: CyberneticLiver
@@ -42,7 +62,7 @@
   - BasicCyberneticLiver
   technologyPrerequisites:
   - CyberneticOrgans
-  position: -3, 14
+  position: 5, 6
 
 - type: technology
   id: UpgradedCyberneticOrgans
@@ -57,4 +77,4 @@
   technologyPrerequisites:
   - CyberneticOrgans
   - HighEndSurgery
-  position: -2, 15
\ No newline at end of file
+  position: 6, 5
\ No newline at end of file
diff --git a/Resources/Prototypes/_Mono/Catalogs/VendingMachines/Inventories/ussp.yml b/Resources/Prototypes/_Mono/Catalogs/VendingMachines/Inventories/ussp.yml
index 7d0e410ccde..72436582e8b 100644
--- a/Resources/Prototypes/_Mono/Catalogs/VendingMachines/Inventories/ussp.yml
+++ b/Resources/Prototypes/_Mono/Catalogs/VendingMachines/Inventories/ussp.yml
@@ -42,5 +42,5 @@
     WeaponShotgunBigLeady: 4294967295 # Infinite
     WeaponDP29: 4294967295 # Infinite
     RubberStampUSSP: 4294967295 # Infinite
-    RDServerUSSPFlatpack: 4294967295 # Infinite
+#    RDServerUSSPFlatpack: 4294967295 # Infinite # Commented by LuaM
     MercenaryTechFabFlatpack: 4294967295 # Infinite
\ No newline at end of file
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/flatpack.yml
index 15b5ff0a9cf..5ca83b6c04b 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/flatpack.yml
@@ -130,19 +130,20 @@
   - type: StaticPrice
     price: 400
 
-- type: entity
-  parent: BaseNFFlatpack
-  id: RDServerUSSPFlatpack
-  name: ussp research and development server flatpack
-  description: A flatpack used for constructing a USSP research and development server.
-  components:
-  - type: Flatpack
-    entity: ResearchAndDevelopmentServerUssp
-  - type: StaticPrice
-    vendPrice: 105000 #Faction token + 5%
-  - type: Sprite
-    layers:
-    - state: science_server
+# Commented by LuaM
+#- type: entity
+#  parent: BaseNFFlatpack
+#  id: RDServerUSSPFlatpack
+#  name: ussp research and development server flatpack
+#  description: A flatpack used for constructing a USSP research and development server.
+#  components:
+#  - type: Flatpack
+#    entity: ResearchAndDevelopmentServerUssp
+#  - type: StaticPrice
+#    vendPrice: 105000 #Faction token + 5%
+#  - type: Sprite
+#    layers:
+#    - state: science_server
 
 - type: entity
   parent: BaseNFFlatpack
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml b/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml
index 265ecdd5846..fd6c4a88c89 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml
@@ -45,7 +45,7 @@
       ResearchDisk10000:
         amount: 2
         defaultPrototype: ResearchDisk10000
-  - type: Construction
-    deconstructionTarget: null
-    graph: Datafarm
-    node: crypto
+#  - type: Construction # Commented by LuaM
+#    deconstructionTarget: null
+#    graph: Datafarm
+#    node: crypto
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml
index 9328056e3fe..36589a51354 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Science/TechDisks/tech_disk_spawners.yml
@@ -102,6 +102,10 @@
     - id: TechDiskHristov
     - id: SpawnLootTechDisksT3Fracture
     - id: TechDiskUniversalShipAmmoAdvanced
+# LuaM-start:
+    - id: TechDiskCombatSilicon
+    - id: TechDiskDataFarm
+# LuaM-end.
 
 #T2 TECH MECH DISKS
 - type: entity
@@ -139,7 +143,10 @@
       - id: TechDiskMechWeaponsLight
       - id: TechDiskMechWeaponsMedium
       - id: TechDiskMechWeaponsHeavy
-      - id: TechDiskCombatSilicon # LuaM
+# LuaM-start:
+      - id: TechDiskCombatSilicon
+      - id: TechDiskDataFarm
+# LuaM-end.
       - !type:GroupSelector
         weight: 3
         children:
@@ -210,3 +217,4 @@
     - id: TechDiskShields
     - id: TechDiskFtl
     - id: TechDiskTranslationPreFracture
+    - id: TechDiskDataFarm # LuaM
diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/datafarms.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/datafarms.yml
index dc2fdd13c02..b806f66483a 100644
--- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/datafarms.yml
+++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/datafarms.yml
@@ -96,7 +96,7 @@
     guides:
     - Science
   - type: ResearchPointSource
-    pointsPerSecond: 20
+    pointsPerSecond: 10 # LuaM: 20 > 10
     active: true
 
 - type: entity
@@ -107,7 +107,7 @@
   components:
   - type: ResearchClient
   - type: ResearchPointSource
-    pointsPerSecond: 200
+    pointsPerSecond: 50 # LuaM: 200 > 50
     active: true
   - type: ApcPowerReceiver
     powerLoad: 10000
diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/disk_printer.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/disk_printer.yml
index 41b76cd8e19..5c4fb45388a 100644
--- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/disk_printer.yml
+++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/disk_printer.yml
@@ -149,6 +149,7 @@
     - TechDiskBulldog
     - TechDiskShields
     - TechDiskFtl
+    - TechDiskDataFarm # LuaM
     chance: 0.95
     offset: 0.0
     rarePrototypes:
@@ -175,6 +176,7 @@
     - TechDiskHristov
     - TechDiskMla73
     - TechDiskUniversalShipAmmoAdvanced
+    - TechDiskDataFarm # LuaM
     chance: 0.95
     offset: 0.0
     rarePrototypes:
@@ -198,6 +200,7 @@
     prototypes:
     - TechDiskBluespaceBags
     - TechDiskTranslationPreFracture
+    - TechDiskDataFarm # LuaM
     chance: 0.95
     offset: 0.0
     rarePrototypes:
diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/faction_servers.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/faction_servers.yml
index 6a61a408b60..b19ca0bdff0 100644
--- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/faction_servers.yml
+++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/faction_servers.yml
@@ -118,6 +118,7 @@
   parent: BaseRdServerFaction
   name: USSP R&D server
   description: Contains the collective knowledge of the USSP in this sector.
+  categories: [ HideSpawnMenu ] # LuaM
   components:
   - type: Sprite
     sprite: _Mono/Structures/Machines/server.rsi
@@ -161,10 +162,10 @@
     - RogueGear
     - RogueEquipment
     - RogueShipyard
-    - Ussp
-    - UsspShipyard
-    - UsspEquipment
-    - UsspWeapons
+#    - Ussp # Commented by LuaM
+#    - UsspShipyard # Commented by LuaM
+#    - UsspEquipment # Commented by LuaM
+#    - UsspWeapons # Commented by LuaM
     - FactionUniversal
     - MechaEngineering
 
diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/lathe.yml
index 68165acb195..2ff15c5d680 100644
--- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/lathe.yml
@@ -58,6 +58,12 @@
     - ResearchedExplosives
     - SecurityEquipment
     - SmartGun
+# LuaM-start:
+    - ArmorBasic
+    - ArmorAdvanced
+    - PunkGear
+    - AdvMeds
+# LuaM-end.
   - type: MaterialStorage
     whitelist:
       tags:
diff --git a/Resources/Prototypes/_Mono/Recipes/Crafting/Graphs/datafarm.yml b/Resources/Prototypes/_Mono/Recipes/Crafting/Graphs/datafarm.yml
index 85498ea3769..2e43755de91 100644
--- a/Resources/Prototypes/_Mono/Recipes/Crafting/Graphs/datafarm.yml
+++ b/Resources/Prototypes/_Mono/Recipes/Crafting/Graphs/datafarm.yml
@@ -1,18 +1,19 @@
-- type: constructionGraph
-  id: Datafarm
-  start: research
-  graph:
-  - node: research
-    entity: DataFarmResearchCircuitboard
-    edges:
-    - to: crypto
-      steps:
-      - tool: Screwing
-        doAfter: 2
-  - node: crypto
-    entity: DataFarmCryptoCircuitboard
-    edges:
-    - to: research
-      steps:
-      - tool: Screwing
-        doAfter: 2
+# Commented by LuaM
+#- type: constructionGraph
+#  id: Datafarm
+#  start: research
+#  graph:
+#  - node: research
+#    entity: DataFarmResearchCircuitboard
+#    edges:
+#    - to: crypto
+#      steps:
+#      - tool: Screwing
+#        doAfter: 2
+#  - node: crypto
+#    entity: DataFarmCryptoCircuitboard
+#    edges:
+#    - to: research
+#      steps:
+#      - tool: Screwing
+#        doAfter: 2
diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/Factions/misc.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/Factions/misc.yml
index f2c4d7f6541..43fe46ec6d0 100644
--- a/Resources/Prototypes/_Mono/Recipes/Lathes/Factions/misc.yml
+++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Factions/misc.yml
@@ -48,8 +48,8 @@
   parent: BaseToolRecipe
   id: SutureTSF
   result: MedicatedSuture
-  categories:
-  - FactionEquipment
+#  categories: # Commented by LuaM
+#  - FactionEquipment
   completetime: 15
   materials:
     Steel: 50
@@ -61,8 +61,8 @@
   parent: BaseToolRecipe
   id: MeshTSF
   result: RegenerativeMesh
-  categories:
-  - FactionEquipment
+#  categories: # Commented by LuaM
+#  - FactionEquipment
   completetime: 15
   materials:
     Steel: 50
@@ -73,7 +73,7 @@
 - type: latheRecipe
   parent: BaseToolRecipe
   id: HyposprayRogue
-  result: Hypospray
+  result: SyndiHypo # LuaM: Hypospray > SyndiHypo
   categories:
   - Tools
   - FactionEquipment
diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/tsfmc.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/tsfmc.yml
index c3d3d79426e..1e98de7b97e 100644
--- a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/tsfmc.yml
+++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/tsfmc.yml
@@ -14,6 +14,7 @@
   recipes:
   - EnergyShieldTSF
   - CrowbarPocketTSF
+  - EnergySwordTSF # LuaM
 
 - type: latheRecipePack
   id: MonoTSFWeaponsDynamicRanged
@@ -47,10 +48,11 @@
   recipes:
   - ForensicsScannerTSF
   - DemagTSF
-  - SutureTSF
-  - MeshTSF
+#  - SutureTSF # Commented by LuaM
+#  - MeshTSF # Commented by LuaM
   - NanolaminateFoamGrenadeTSF
   - PortableRecharger
   - MotionDetectorTSF
   - BasicBorgCombatModuleTSF
   - AdvancedBorgCombatModuleTSF
+  - Hypospray # LuaM
\ No newline at end of file
diff --git a/Resources/Prototypes/_Mono/Research/Organizations/ullman.yml b/Resources/Prototypes/_Mono/Research/Organizations/ullman.yml
index 8d67512a329..3201bd3854d 100644
--- a/Resources/Prototypes/_Mono/Research/Organizations/ullman.yml
+++ b/Resources/Prototypes/_Mono/Research/Organizations/ullman.yml
@@ -9,7 +9,8 @@
   - UllmanWeaponPulsePistol
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 16, 2
+  - PortableMicrofusionWeaponry # LuaM
+  position: 8, 8
 
 - type: technology
   id: UllmanWeaponHiEnd
@@ -28,7 +29,7 @@
   technologyPrerequisites:
   - UniversalMaterialResearchT2
   - UllmanPulseAdv
-  position: 16, 8
+  position: 8, 7
 
 - type: technology
   id: UllmanHardsuitBasic
@@ -42,8 +43,8 @@
   - UllmanHardsuitEngineer
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 16, 1
-
+  - HardsuitsArmoredAdvanced # LuaM
+  position: 2, 7
 
 - type: technology
   id: UllmanHardsuitHiEnd
@@ -57,7 +58,8 @@
   - UllmanHardsuitEnforcerMKII
   technologyPrerequisites:
   - UniversalMaterialResearchT2
-  position: 16, 7
+  - UllmanHardsuitBasic # LuaM
+  position: 2, 6
 
 
 
diff --git a/Resources/Prototypes/_Mono/Research/Rogue/faction_tacsuits.yml b/Resources/Prototypes/_Mono/Research/Rogue/faction_tacsuits.yml
index f3b8894f27a..e249ea00da1 100644
--- a/Resources/Prototypes/_Mono/Research/Rogue/faction_tacsuits.yml
+++ b/Resources/Prototypes/_Mono/Research/Rogue/faction_tacsuits.yml
@@ -11,7 +11,8 @@
   - ClothingOuterVestWebRogue
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, 1
+  - HardsuitsArmored # LuaM
+  position: 8, 13
 
 - type: technology
   id: RogueAdvancedEquipment
@@ -28,7 +29,7 @@
   technologyPrerequisites:
   - RogueBasicEquipment
   - UniversalMaterialResearchT2
-  position: 12, 7
+  position: 8, 10
 
 - type: technology
   id: RogueSyndicateTacsuits
@@ -43,7 +44,7 @@
   technologyPrerequisites:
   - RogueAdvancedEquipment
   - UniversalMaterialResearchT3
-  position: 12, 12
+  position: 8, 7
 
 - type: technology
   id: RogueSuperArmor
@@ -51,11 +52,11 @@
   entityIcon: ClothingOuterHardsuitCybersunStealth
   discipline: RogueEquipment
   tier: 2
-  cost: 20000
+  cost: 40000 # LuaM: 20000 > 40000
   recipeUnlocks:
   - ClothingOuterHardsuitCybersunStealthRogue
   - ClothingOuterHardsuitJuggernautRogue
   technologyPrerequisites:
-  - RogueSyndicateTacsuits
-  position: 13, 12
+  - RogueAdvancedEquipment # LuaM: RogueSyndicateTacsuits > RogueAdvancedEquipment
+  position: 10, 10
 
diff --git a/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml b/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml
index e2b62332f1c..003eb55b20b 100644
--- a/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml
+++ b/Resources/Prototypes/_Mono/Research/Rogue/rogue_misc.yml
@@ -14,7 +14,8 @@
   - SnakeletVoucherRogue
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 11, 1
+  - Shuttlecraft # LuaM
+  position: 8, 13
 
 - type: technology
   id: PdvTierTwoVouchers
@@ -28,7 +29,8 @@
   technologyPrerequisites:
   - PdvTierOneVouchers
   - UniversalMaterialResearchT2
-  position: 11, 7
+  - ShuttleAdvancedComponents # LuaM
+  position: 8, 11
 
 - type: technology
   id: PdvTierThreeVouchers
@@ -43,12 +45,13 @@
   technologyPrerequisites:
   - PdvTierTwoVouchers
   - UniversalMaterialResearchT3
-  position: 11, 12
+  - ShuttleCtlaAdvancedDriveResearch # LuaM
+  position: 8, 9
 
 - type: technology
   id: RogueJaws
   name: research-technology-rogue-jaws
-  entityIcon: JawsOfLife
+  entityIcon: SyndicateJawsOfLife # LuaM: JawsOfLife > SyndicateJawsOfLife
   discipline: RogueGear
   tier: 1
   cost: 10000
@@ -57,20 +60,22 @@
   # - NaniteApplicatorSyndicate Commented by LuaM  
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, -1
+  - AdvancedToolsTechnology # LuaM
+  position: 8, 13
 
 - type: technology
   id: RogueHypospray
   name: research-technology-rogue-hypospray
-  entityIcon: Hypospray
+  entityIcon: SyndiHypo # LuaM: Hypospray > SyndiHypo
   discipline: RogueGear
   tier: 2
-  cost: 10000
+  cost: 25000 # LuaM: 10000 > 25000
   recipeUnlocks:
   - HyposprayRogue
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, -2
+  - AdvancedTreatment # LuaM
+  position: 10, 13
 
 - type: technology
   id: RogueEmag
@@ -84,20 +89,22 @@
   - AccessBreakerRogue
   technologyPrerequisites:
   - UniversalMaterialResearchT2
-  position: 12, 10
+  - SuperParts # LuaM
+  position: 6, 13
 
-- type: technology
-  id: RogueThermals
-  name: research-technology-rogue-thermals
-  entityIcon: ClothingEyesThermalVisionGoggles
-  discipline: RogueGear
-  tier: 1
-  cost: 15000
-  recipeUnlocks:
-  - ClothingEyesThermalVisionGoggles
-  technologyPrerequisites:
-  - UniversalMaterialResearchT1
-  position: 12, -3
+# Commented by LuaM
+#- type: technology
+#  id: RogueThermals
+#  name: research-technology-rogue-thermals
+#  entityIcon: ClothingEyesThermalVisionGoggles
+#  discipline: RogueGear
+#  tier: 1
+#  cost: 15000
+#  recipeUnlocks:
+#  - ClothingEyesThermalVisionGoggles
+#  technologyPrerequisites:
+#  - UniversalMaterialResearchT1
+#  position: 12, -3
 
 - type: technology
   id: PDVBasicBorgModule
@@ -110,7 +117,8 @@
   - BasicBorgCombatModulePDV
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, -4
+  - RogueJaws # LuaM
+  position: 8, 11
 
 - type: technology
   id: PDVAdvancedBorgModule
@@ -118,10 +126,11 @@
   entityIcon: BorgModulePDVAdvancedWeapon
   discipline: RogueGear
   tier: 3
-  cost: 65000
+  cost: 35000 # LuaM: 65000 > 35000
   recipeUnlocks:
   - AdvancedBorgCombatModulePDV
   technologyPrerequisites:
   - UniversalMaterialResearchT3
   - PDVBasicBorgModule
-  position: 12, 15
+  - MechBasic # LuaM
+  position: 8, 9
\ No newline at end of file
diff --git a/Resources/Prototypes/_Mono/Research/Rogue/rogue_weapons.yml b/Resources/Prototypes/_Mono/Research/Rogue/rogue_weapons.yml
index 4d5b033cad8..6f5d65934e9 100644
--- a/Resources/Prototypes/_Mono/Research/Rogue/rogue_weapons.yml
+++ b/Resources/Prototypes/_Mono/Research/Rogue/rogue_weapons.yml
@@ -4,14 +4,18 @@
   entityIcon: EnergySword
   discipline: RogueWeaponry
   tier: 3
-  cost: 25000
+  cost: 30000 # LuaM: 25000 > 30000
   recipeUnlocks:
   - EnergyShieldRogue
   - EnergySwordRogue
   - EnergyDaggerRogue
   technologyPrerequisites:
   - UniversalMaterialResearchT2
-  position: 12, 9
+# LuaM-start:
+  - RogueAdvancedGuns
+  - AdvancedRiotControl
+# LuaM-end.
+  position: 10, 10
 
 - type: technology
   id: HFSwordTech
@@ -24,7 +28,7 @@
   - HFSwordVT7
   technologyPrerequisites:
   - RogueEsword
-  position: 12, 14
+  position: 11, 10
 
 - type: technology
   id: RogueBasicGuns
@@ -32,7 +36,7 @@
   entityIcon: WeaponSubMachineGunC20r
   discipline: RogueWeaponry
   tier: 1
-  cost: 15000
+  cost: 25000 # LuaM: 15000 > 25000
   recipeUnlocks:
   - WeaponSubMachineGunC20rRogue
   - WeaponRevolverPythonRogue
@@ -41,7 +45,8 @@
   - PrintableDirtyBomb
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, 2
+  - MercArmementSimple # LuaM
+  position: 8, 13
 
 - type: technology
   id: RogueAdvancedGuns
@@ -49,7 +54,7 @@
   entityIcon: WeaponRifleM90
   discipline: RogueWeaponry
   tier: 2
-  cost: 55000
+  cost: 50000 # LuaM: 55000 > 50000
   recipeUnlocks:
   - WeaponSubMachineGunWt550Rogue
   - WeaponSubMachineGunAtreidesRogue
@@ -58,7 +63,7 @@
   technologyPrerequisites:
   - RogueBasicGuns
   - UniversalMaterialResearchT2
-  position: 12, 8
+  position: 8, 10
 
 - type: technology
   id: RogueHeavyWeapons
@@ -82,7 +87,7 @@
   technologyPrerequisites:
   - RogueAdvancedGuns
   - UniversalMaterialResearchT3
-  position: 12, 13
+  position: 8, 7
 
 - type: technology
   id: RogueSubsonic
@@ -102,4 +107,4 @@
   - AmmoBox635x40mmCaselessBig
   technologyPrerequisites:
   - RogueAdvancedGuns
-  position: 13, 8
+  position: 6, 10
diff --git a/Resources/Prototypes/_Mono/Research/TSF/faction_tacsuits.yml b/Resources/Prototypes/_Mono/Research/TSF/faction_tacsuits.yml
index 7f3b8a71f43..37559edb5cb 100644
--- a/Resources/Prototypes/_Mono/Research/TSF/faction_tacsuits.yml
+++ b/Resources/Prototypes/_Mono/Research/TSF/faction_tacsuits.yml
@@ -10,7 +10,8 @@
   - ClothingOuterHardsuitM82bTsf
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, 1
+  - HardsuitsArmored # LuaM
+  position: 8, 13
 
 - type: technology
   id: TsfmcAdvancedEquipment
@@ -25,7 +26,7 @@
   technologyPrerequisites:
   - TsfmcBasicEquipment
   - UniversalMaterialResearchT2
-  position: 12, 7
+  position: 8, 10
 
 - type: technology
   id: TsfmcExperimentalEquipment
@@ -39,4 +40,4 @@
   technologyPrerequisites:
   - TsfmcAdvancedEquipment
   - UniversalMaterialResearchT3
-  position: 12, 12
+  position: 8, 7
\ No newline at end of file
diff --git a/Resources/Prototypes/_Mono/Research/TSF/tsf_misc.yml b/Resources/Prototypes/_Mono/Research/TSF/tsf_misc.yml
index 6db76f89dc9..5421367f205 100644
--- a/Resources/Prototypes/_Mono/Research/TSF/tsf_misc.yml
+++ b/Resources/Prototypes/_Mono/Research/TSF/tsf_misc.yml
@@ -4,16 +4,17 @@
   entityIcon: ForensicScanner
   discipline: TsfmcGear
   tier: 1
-  cost: 5000
+  cost: 15000 # LuaM: 5000 > 15000
   recipeUnlocks:
   - ForensicsScannerTSF
   - DemagTSF
-  - ClothingEyesNightVisionGoggles
+#  - ClothingEyesNightVisionGoggles # Commented by LuaM
   - MotionDetectorTSF
   - CrowbarPocketTSF
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, -1
+  - SuperParts # LuaM
+  position: 6, 13
 
 - type: technology
   id: TsfmcMopp
@@ -27,7 +28,7 @@
   - ClothingHandsGlovesMoppTsf
   technologyPrerequisites:
   - TsfmcAdvancedEquipment
-  position: 13, 7
+  position: 10, 10
 
 - type: technology
   id: TsfEshield
@@ -38,9 +39,14 @@
   cost: 30000
   recipeUnlocks:
   - EnergyShieldTSF
+  - EnergySwordTSF # LuaM
   technologyPrerequisites:
   - UniversalMaterialResearchT2
-  position: 12, 9
+# LuaM-start:
+  - TsfAdvancedWeapons
+  - AdvancedRiotControl
+# LuaM-end.
+  position: 10, 10
 
 - type: technology
   id: TsfTierOneVouchers
@@ -54,7 +60,8 @@
   - ShipVoucherTsfT1RandomRecipe
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 11, 1
+  - Shuttlecraft # LuaM
+  position: 8, 13
 
 - type: technology
   id: TsfTierTwoVouchers
@@ -68,7 +75,8 @@
   technologyPrerequisites:
   - TsfTierOneVouchers
   - UniversalMaterialResearchT2
-  position: 11, 7
+  - ShuttleAdvancedComponents # LuaM
+  position: 8, 11
 
 - type: technology
   id: TsfTierThreeVouchers
@@ -83,13 +91,14 @@
   technologyPrerequisites:
   - TsfTierTwoVouchers
   - UniversalMaterialResearchT3
-  position: 11, 12
+  - ShuttleCtlaAdvancedDriveResearch # LuaM
+  position: 8, 9
 
 - type: technology
   id: TsfMeds
   name: research-technology-tsfmc-advanced-meds
   entityIcon: MedkitCombatFilled
-  discipline: TsfmcGear
+  discipline: CivilianServices # LuaM: TsfmcGear > CivilianServices
   tier: 2
   cost: 20000
   recipeUnlocks:
@@ -97,7 +106,8 @@
   - MeshTSF
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, -2
+  - AdvancedTreatment # LuaM
+  position: 4, 9
 
 - type: technology
   id: TsfNanofoam
@@ -110,7 +120,8 @@
   - NanolaminateFoamGrenadeTSF
   technologyPrerequisites:
   - UniversalMaterialResearchT2
-  position: 12, 10
+  - AdvancedToolsTechnology # LuaM
+  position: 4, 12
 
 - type: technology
   id: TsfPortableRecharger
@@ -120,10 +131,11 @@
   tier: 1
   cost: 15000
   recipeUnlocks:
-    - PortableRecharger
+  - PortableRecharger
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, -3
+  - PowerGeneration # LuaM
+  position: 8, 13
 
 - type: technology
   id: TSFBasicBorgModule
@@ -136,7 +148,8 @@
   - BasicBorgCombatModuleTSF
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, -4
+  - TsfPortableRecharger # LuaM
+  position: 8, 11
 
 - type: technology
   id: TSFAdvancedBorgModule
@@ -144,10 +157,11 @@
   entityIcon: BorgModuleTSFAdvancedWeapon
   discipline: TsfmcGear
   tier: 3
-  cost: 65000
+  cost: 35000 # LuaM: 65000 > 35000
   recipeUnlocks:
   - AdvancedBorgCombatModuleTSF
   technologyPrerequisites:
   - UniversalMaterialResearchT3
   - TSFBasicBorgModule
-  position: 12, 14
+  - MechBasic # LuaM
+  position: 8, 9
diff --git a/Resources/Prototypes/_Mono/Research/TSF/tsf_weapons.yml b/Resources/Prototypes/_Mono/Research/TSF/tsf_weapons.yml
index 0734d60bd95..c92efffeca7 100644
--- a/Resources/Prototypes/_Mono/Research/TSF/tsf_weapons.yml
+++ b/Resources/Prototypes/_Mono/Research/TSF/tsf_weapons.yml
@@ -12,7 +12,8 @@
   - WeaponRifleMR3CTSF
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, 2
+  - MercArmementSimple # LuaM
+  position: 8, 13
 
 - type: technology
   id: TsfAdvancedWeapons
@@ -20,7 +21,7 @@
   entityIcon: WeaponRifleAnnie
   discipline: TsfmcWeaponry
   tier: 2
-  cost: 30000
+  cost: 50000 # LuaM: 30000 > 50000
   recipeUnlocks:
   - WeaponRifleAnnieTSF
   - WeaponLMGGrizzlyTSF
@@ -32,7 +33,7 @@
   technologyPrerequisites:
   - TsfBasicGuns
   - UniversalMaterialResearchT2
-  position: 12, 8
+  position: 8, 10
 
 - type: technology
   id: TsfSuperWeapons
@@ -40,7 +41,7 @@
   entityIcon: WeaponRifleXlr556
   discipline: TsfmcWeaponry
   tier: 3
-  cost: 30000
+  cost: 75000 # LuaM: 30000 > 75000
   recipeUnlocks:
   - WeaponRifleXlr556Tsf
   - WeaponRifleMR8CTSF
@@ -55,4 +56,4 @@
   technologyPrerequisites:
   - TsfAdvancedWeapons
   - UniversalMaterialResearchT3
-  position: 12, 13
+  position: 8, 7
diff --git a/Resources/Prototypes/_Mono/Research/USSP/ussp_misc.yml b/Resources/Prototypes/_Mono/Research/USSP/ussp_misc.yml
index 4e7ced8607d..cb60bd5d120 100644
--- a/Resources/Prototypes/_Mono/Research/USSP/ussp_misc.yml
+++ b/Resources/Prototypes/_Mono/Research/USSP/ussp_misc.yml
@@ -3,14 +3,14 @@
   id: UsspMediumExplosives
   name: research-technology-ussp-explosives-medium
   entityIcon: GrenadeShrapnel
-  discipline: Ussp
+  discipline: Arsenal # LuaM: Ussp > Arsenal
   tier: 1
   cost: 60000
   technologyPrerequisites:
-  - UniversalMaterialResearchT1
+  - PrintableExplosives # LuaM: UniversalMaterialResearchT1 > PrintableExplosives
   recipeUnlocks:
   - GrenadeShrapnelUSSP
   - GrenadeIncendiaryUSSP
   - SeismicChargeUSSP
   - TearGasGrenadeUSSP
-  position: 12, 3
+  position: 9, 10
diff --git a/Resources/Prototypes/_Mono/Research/USSP/ussp_suits.yml b/Resources/Prototypes/_Mono/Research/USSP/ussp_suits.yml
index c1ee6ada74d..1ae90c3168b 100644
--- a/Resources/Prototypes/_Mono/Research/USSP/ussp_suits.yml
+++ b/Resources/Prototypes/_Mono/Research/USSP/ussp_suits.yml
@@ -2,7 +2,7 @@
   id: UsspBasicSuits
   name: research-technology-ussp-suits-basic
   entityIcon: ClothingOuterHardsuitUsspL10
-  discipline: UsspEquipment
+  discipline: Arsenal # LuaM: UsspEquipment > Arsenal
   tier: 1
   cost: 25000
   recipeUnlocks:
@@ -10,13 +10,14 @@
   - ClothingOuterHardsuitUsspL10AUSSP
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 12, 1
+  - HardsuitsArmoredAdvanced # LuaM
+  position: 6, 7
 
 - type: technology
   id: UsspMediumSuits
   name: research-technology-ussp-suits-medium
   entityIcon: ClothingOuterHardsuitUsspL27
-  discipline: UsspEquipment
+  discipline: Arsenal # LuaM: UsspEquipment > Arsenal
   tier: 2
   cost: 45000
   recipeUnlocks:
@@ -25,13 +26,13 @@
   technologyPrerequisites:
   - UsspBasicSuits
   - UniversalMaterialResearchT2
-  position: 12, 7
+  position: 6, 6
 
 - type: technology
   id: UsspAdvancedSuits
   name: research-technology-ussp-suits-advanced
   entityIcon: ClothingModsuitUSSPZastavnik
-  discipline: UsspEquipment
+  discipline: Arsenal # LuaM: UsspEquipment > Arsenal
   tier: 3
   cost: 85000
   recipeUnlocks:
@@ -40,4 +41,4 @@
   technologyPrerequisites:
   - UsspMediumSuits
   - UniversalMaterialResearchT3
-  position: 12, 12
+  position: 6, 5
diff --git a/Resources/Prototypes/_Mono/Research/USSP/ussp_weapons.yml b/Resources/Prototypes/_Mono/Research/USSP/ussp_weapons.yml
index 09527e7a36e..8bb1531c08f 100644
--- a/Resources/Prototypes/_Mono/Research/USSP/ussp_weapons.yml
+++ b/Resources/Prototypes/_Mono/Research/USSP/ussp_weapons.yml
@@ -2,36 +2,37 @@
   id: UsspMediumGuns
   name: research-technology-ussp-guns-medium
   entityIcon: WeaponRifleAK502
-  discipline: UsspWeapons
+  discipline: Arsenal # LuaM: UsspWeapons > Arsenal
   tier: 2
   cost: 35000
   recipeUnlocks:
   - WeaponRifleAK502USSP
   - WeaponRevolverMatebaUSSP
   technologyPrerequisites:
-  - UniversalMaterialResearchT1
-  position: 12, 2
+  - UniversalMaterialResearchT2 # LuaM: UniversalMaterialResearchT1 > UniversalMaterialResearchT2
+  - MercArmementAdvanced # LuaM
+  position: 12, 7
 
 - type: technology
   id: UsspAk410
   name: research-technology-ussp-guns-ak410
   entityIcon: WeaponRifleAK410
-  discipline: UsspWeapons
+  discipline: Arsenal # LuaM: UsspWeapons > Arsenal
   tier: 2
   cost: 25000
   recipeUnlocks:
   - WeaponRifleAK410USSP
   - AmmoBox762x39mmSubsonic
   technologyPrerequisites:
-  - UsspMediumGuns
-  - UniversalMaterialResearchT2
-  position: 12, 8
+  - MercArmementSimple # LuaM: UsspMediumGuns > MercArmementSimple
+#  - UniversalMaterialResearchT2 # Commented by LuaM
+  position: 13, 11
 
 - type: technology
   id: UsspAdvancedGuns
   name: research-technology-ussp-guns-advanced
   entityIcon: WeaponDP29
-  discipline: UsspWeapons
+  discipline: Arsenal # LuaM: UsspWeapons > Arsenal
   tier: 3
   cost: 80000
   recipeUnlocks:
@@ -39,6 +40,6 @@
   - MagazineDP29
   - WeaponShotgunBigLeadyUSSP
   technologyPrerequisites:
-  - UsspMediumGuns
-  - UniversalMaterialResearchT3
-  position: 12, 13
+  - UsspAk410 # LuaM: UsspMediumGuns > UsspAk410
+  - UniversalMaterialResearchT1 # LuaM: UniversalMaterialResearchT3 > UniversalMaterialResearchT1
+  position: 14, 11
diff --git a/Resources/Prototypes/_Mono/Research/Universal/armor_plates.yml b/Resources/Prototypes/_Mono/Research/Universal/armor_plates.yml
index f459430c803..0d25f854bc7 100644
--- a/Resources/Prototypes/_Mono/Research/Universal/armor_plates.yml
+++ b/Resources/Prototypes/_Mono/Research/Universal/armor_plates.yml
@@ -20,7 +20,7 @@
   - ArmorPlatePierce
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 8, 1
+  position: 10, 11
 
 - type: technology
   id: UniversalArmorPlatesT2
@@ -35,4 +35,4 @@
   technologyPrerequisites:
   - UniversalArmorPlatesT1
   - UniversalMaterialResearchT2
-  position: 8, 2
+  position: 10, 10
diff --git a/Resources/Prototypes/_Mono/Research/Universal/economy.yml b/Resources/Prototypes/_Mono/Research/Universal/economy.yml
index 786087d0bd4..3eabfe96030 100644
--- a/Resources/Prototypes/_Mono/Research/Universal/economy.yml
+++ b/Resources/Prototypes/_Mono/Research/Universal/economy.yml
@@ -10,7 +10,7 @@
   - CentrifugeLatheMiniCircuitboard
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 9, 1
+  position: 6, 11
 
 - type: entity
   id: UraniumProcessingIcon
@@ -32,7 +32,7 @@
   technologyPrerequisites:
   - UniversalMaterialResearchT2
   - BasicProcessing
-  position: 9, 7
+  position: 6, 10
 
 - type: entity
   id: UraniumEnrichedProcessingIcon
diff --git a/Resources/Prototypes/_Mono/Research/Universal/explosives.yml b/Resources/Prototypes/_Mono/Research/Universal/explosives.yml
index b8446be5b15..ca686e3a940 100644
--- a/Resources/Prototypes/_Mono/Research/Universal/explosives.yml
+++ b/Resources/Prototypes/_Mono/Research/Universal/explosives.yml
@@ -3,9 +3,9 @@
   id: PrintableExplosives
   name: research-technology-printable-explosives
   entityIcon: C4
-  discipline: FactionUniversal
+  discipline: Arsenal # LuaM: FactionUniversal > Arsenal
   tier: 2
-  cost: 7500
+  cost: 40000 # LuaM: 7500 > 40000
   recipeUnlocks:
   - PrintableC4
   - PrintableEmpGrenade
@@ -15,4 +15,5 @@
   - PrintableBombCollarSealer
   technologyPrerequisites:
   - UniversalPlastitaniumCore
-  position: 7, 7
+  - ExplosiveTechnology # LuaM
+  position: 9, 11
diff --git a/Resources/Prototypes/_Mono/Research/Universal/prerequisites.yml b/Resources/Prototypes/_Mono/Research/Universal/prerequisites.yml
index 0c1e6dbf5eb..0b92d2749b5 100644
--- a/Resources/Prototypes/_Mono/Research/Universal/prerequisites.yml
+++ b/Resources/Prototypes/_Mono/Research/Universal/prerequisites.yml
@@ -24,8 +24,10 @@
   entityIcon: SheetSteel
   discipline: FactionUniversal
   tier: 1
-  cost: 5000
-  position: 10, 0
+  cost: 25000 # LuaM: 5000 > 25000
+  position: 8, 13
+  technologyPrerequisites: # LuaM
+  - AdvancedParts
 
 - type: technology
   id: UniversalMaterialResearchT2
@@ -36,7 +38,7 @@
   cost: 50000
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 10, 6
+  position: 8, 10
   recipeUnlocks:
   - AmmoBox762x39mmBigFMJ
   - AmmoBox762x51mmBigFMJ
@@ -56,4 +58,4 @@
   cost: 100000
   technologyPrerequisites:
   - UniversalMaterialResearchT2
-  position: 10, 11
+  position: 8, 7
diff --git a/Resources/Prototypes/_Mono/Research/Universal/shipgun_ammo.yml b/Resources/Prototypes/_Mono/Research/Universal/shipgun_ammo.yml
index 543f377cbeb..ad313a829a5 100644
--- a/Resources/Prototypes/_Mono/Research/Universal/shipgun_ammo.yml
+++ b/Resources/Prototypes/_Mono/Research/Universal/shipgun_ammo.yml
@@ -4,12 +4,12 @@
   entityIcon: CharonSlugAmmo
   discipline: FactionUniversal
   tier: 1
-  cost: 7500
+  cost: 45000 # LuaM: 7500 > 45000
   recipeUnlocks:
   - CharonSlugUniversal
   technologyPrerequisites:
   - UniversalPlastitaniumCore
-  position: 7, 8
+  position: 4, 5
 
 - type: technology
   id: UniversalSubnuclearRailgunAmmo
@@ -23,7 +23,7 @@
   technologyPrerequisites:
   - UniversalRailgunAmmo
   - UniversalMaterialResearchT3
-  position: 10, 15
+  position: 8, 3
 
 - type: technology
   id: UniversalTorpedoAmmo
@@ -31,13 +31,13 @@
   entityIcon: Asm220TorpedoHE
   discipline: FactionUniversal
   tier: 2
-  cost: 20000
+  cost: 25000 # LuaM: 20000 > 25000
   recipeUnlocks:
   - ASM220TorpedoHEUniversal
   - ASM220TorpedoECMUniversal
   technologyPrerequisites:
   - UniversalPlastitaniumCore
-  position: 8, 8
+  position: 6, 5
 
 - type: technology
   id: UniversalTorpedoAmmoAdvanced
@@ -45,12 +45,12 @@
   entityIcon: Asm220TorpedoLOSAT
   discipline: FactionUniversal
   tier: 3
-  cost: 20000
+  cost: 25000 # LuaM: 20000 > 25000
   recipeUnlocks:
   - ASM220TorpedoLOSATUniversal
   technologyPrerequisites:
   - UniversalTorpedoAmmo
-  position: 8, 9
+  position: 6, 4
 
 - type: technology
   id: Universal150mmAmmo
@@ -58,13 +58,13 @@
   entityIcon: 150mmEmpShell
   discipline: FactionUniversal
   tier: 1
-  cost: 5000
+  cost: 35000 # LuaM: 5000 > 35000
   recipeUnlocks:
   - 150mmApShellUniversal
   - 150mmEmpShellUniversal
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 7, 2
+  position: 4, 12
 
 - type: technology
   id: UniversalLightFighterOrdinance
@@ -72,13 +72,13 @@
   entityIcon: LightFighterOrdinanceGPOItem
   discipline: FactionUniversal
   tier: 1
-  cost: 5000
+  cost: 30000 # LuaM: 5000 > 30000
   recipeUnlocks:
   - GPOL50BombUniversal
   - ZenithRocketUniversal
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 6, 2
+  position: 3, 12
 
 - type: technology
   id: UniversalAdvancedLightFighterOrdinance
@@ -91,5 +91,5 @@
   - QuasarAcceleratorUniversal
   technologyPrerequisites:
   - UniversalLightFighterOrdinance
-  - UniversalPlastitaniumCore
-  position: 6, 5
+  - UniversalRailgunAmmo # LuaM: UniversalPlastitaniumCore > UniversalRailgunAmmo
+  position: 3, 5
diff --git a/Resources/Prototypes/_Mono/Research/Universal/smallarms.yml b/Resources/Prototypes/_Mono/Research/Universal/smallarms.yml
index 996ada49c43..25349e95126 100644
--- a/Resources/Prototypes/_Mono/Research/Universal/smallarms.yml
+++ b/Resources/Prototypes/_Mono/Research/Universal/smallarms.yml
@@ -7,7 +7,7 @@
   cost: 20000
   technologyPrerequisites:
   - UniversalMaterialResearchT2
-  position: 8, 6
+  position: 5, 8
   recipeUnlocks:
   - Magazine762x51mmPlasteelAP
   - AmmoBox762x51mmPlasteelAP
@@ -86,7 +86,7 @@
   cost: 30000
   technologyPrerequisites:
   - UniversalPlastitaniumCore
-  position: 8, 5
+  position: 6, 7
   recipeUnlocks:
   - AmmoBox23x75mmSlugRIP
   - Magazine12_gaugeSlugRIP
@@ -158,7 +158,7 @@
   - AmmoBox23x75mmFlashbang
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 9, -1
+  position: 5, 12
 
 - type: technology
   id: UraniumMunitions
@@ -198,4 +198,4 @@
   - AmmoBox45_ACPUranium
   technologyPrerequisites:
   - UniversalPlastitaniumCore
-  position: 7, 5
+  position: 4, 8
diff --git a/Resources/Prototypes/_Mono/Research/arsenal.yml b/Resources/Prototypes/_Mono/Research/arsenal.yml
index 346325ef952..c6bbc1fb97d 100644
--- a/Resources/Prototypes/_Mono/Research/arsenal.yml
+++ b/Resources/Prototypes/_Mono/Research/arsenal.yml
@@ -11,8 +11,8 @@
   - WeaponShotgunBigBuddy
   technologyPrerequisites:
   - MercArmementSimple
-  - AdvancedParts
-  position: 3, 1
+#  - AdvancedParts # Commented by LuaM
+  position: 12, 9
 
 - type: technology
   id: MercArmementSimple
@@ -33,8 +33,9 @@
   - WeaponRifleVulcanFCMC
   - WeaponShotgunKammererNF
   technologyPrerequisites:
-  - BasicParts
-  position: 2, 1
+  - AdvancedParts # LuaM: BasicParts > AdvancedParts
+  - WeaponizedLaserManipulation # LuaM
+  position: 12, 11
 
 - type: technology
   id: AdvancedMeleeCombatOptions
@@ -48,19 +49,19 @@
   - HardlightShield
   - WeaponShockMaul
   technologyPrerequisites:
-  - AdvancedRiotControl
-  - SuperParts
-  position: 4, 2
+  - MercArmementAdvanced # LuaM: AdvancedRiotControl > MercArmementAdvanced
+  - PortableMicrofusionWeaponry # LuaM: SuperParts > PortableMicrofusionWeaponry
+  position: 14, 8
 
 - type: technology
   id: DroneResearch
   name: research-technology-drones-1
   entityIcon: ShipVoucherTsfT0
-  discipline: Arsenal
+  discipline: FactionUniversal # LuaM: Arsenal > FactionUniversal
   tier: 3
-  cost: 15000
+  cost: 45000 # LuaM: 15000 > 45000
   recipeUnlocks:
   - BalorDroneVoucherMerc
   technologyPrerequisites:
   - UniversalMaterialResearchT1
-  position: 9, -2
+  position: 10, 13
diff --git a/Resources/Prototypes/_Mono/Research/experimental.yml b/Resources/Prototypes/_Mono/Research/experimental.yml
index e07a2c10453..1e0ef09fe85 100644
--- a/Resources/Prototypes/_Mono/Research/experimental.yml
+++ b/Resources/Prototypes/_Mono/Research/experimental.yml
@@ -10,7 +10,7 @@
   - ClothingOuterHardsuitCarp
   technologyPrerequisites:
   - BasicParts
-  position: 1, -5
+  position: 5, 12
 
 - type: technology
   id: BluespaceTethering
@@ -23,7 +23,7 @@
   - ClothingShoesBootsMagVoid
   technologyPrerequisites:
   - MagnetsTech
-  position: -2, -2
+  position: 7, 6
 
 - type: technology
   id: BasicResearch
@@ -46,7 +46,7 @@
   - ProximitySensor
   technologyPrerequisites:
   - BasicParts
-  position: -1, -1
+  position: 10, 12
 
 - type: technology
   id: BasicParts
@@ -55,7 +55,7 @@
   discipline: Experimental
   tier: 1
   cost: 5000
-  position: 0, 0
+  position: 8, 13
 
 - type: technology
   id: AdvancedResearch
@@ -72,7 +72,7 @@
   - AnomalyVesselExperimentalCircuitboard
   technologyPrerequisites:
   - BasicResearch
-  position: -1, -2
+  position: 10, 11
 
 - type: technology
   id: DataFarmingTechnology
@@ -82,7 +82,7 @@
   tier: 3
   cost: 25000
   recipeUnlocks:
-  - DataFarmResearchCircuitboard
+  - DataFarmCryptoCircuitboard # LuaM: DataFarmResearchCircuitboard > DataFarmCryptoCircuitboard
   technologyPrerequisites:
   - SuperParts
-  position: 1, 18
+  position: 7, 3
diff --git a/Resources/Prototypes/_Mono/Research/mech_research.yml b/Resources/Prototypes/_Mono/Research/mech_research.yml
index 1f92e1057ce..9d0f8610827 100644
--- a/Resources/Prototypes/_Mono/Research/mech_research.yml
+++ b/Resources/Prototypes/_Mono/Research/mech_research.yml
@@ -4,7 +4,7 @@
   entityIcon: MechRipleyBattery
   discipline: MechaEngineering
   tier: 1
-  cost: 12000
+  cost: 15000 # LuaM: 12000 > 15000
   recipeUnlocks:
   - RipleyHarness
   - RipleyLArm
@@ -25,7 +25,7 @@
   - ClarkePeripheralsElectronics
   technologyPrerequisites:
   - AdvancedParts
-  position: 2, 10
+  position: 8, 13
 
 
 # - type: technology
@@ -46,7 +46,7 @@
   entityIcon: MechGygaxBattery
   discipline: MechaEngineering
   tier: 2
-  cost: 32500
+  cost: 35000 # LuaM: 32500 > 35000
   recipeUnlocks:
   - GygaxHarness
   - GygaxArmor
@@ -77,7 +77,7 @@
   technologyPrerequisites:
   - SuperParts
   - MechBasic
-  position: 2, 11
+  position: 8, 11
 
 - type: technology
   id: Broadsword
@@ -114,7 +114,7 @@
   #- IFFMechaGreenTriangle
   technologyPrerequisites:
   - MechCombat
-  position: 3, 11
+  position: 8, 9
 
 - type: technology
   id: BroadswordSubtypes
@@ -130,7 +130,7 @@
   - MediumMechTOW
   technologyPrerequisites:
   - Broadsword
-  position: 3, 12
+  position: 9, 9
 
 - type: technology
   id: Flail
@@ -138,7 +138,7 @@
   entityIcon: AFFlail
   discipline: MechaEngineering
   tier: 3
-  cost: 50000
+  cost: 75000 # LuaM: 50000 > 75000
   recipeUnlocks:
   - FlailHarness
   - FlailHead
@@ -154,7 +154,7 @@
   - HeavyMechProjector
   technologyPrerequisites:
   - Broadsword
-  position: 4, 11
+  position: 8, 7
 
 - type: technology
   id: FlailSubtypes
@@ -162,7 +162,7 @@
   entityIcon: AFFlailE
   discipline: MechaEngineering
   tier: 3
-  cost: 30000
+  cost: 45000 # LuaM: 30000 > 45000
   recipeUnlocks:
   - MaceHarness
   - SpyglassHarness
@@ -170,4 +170,4 @@
   - EWACMechaJammer
   technologyPrerequisites:
   - Flail
-  position: 4, 12
+  position: 9, 7
diff --git a/Resources/Prototypes/_Mono/Research/shuttlecomps.yml b/Resources/Prototypes/_Mono/Research/shuttlecomps.yml
index c460a3ba944..7c190435b1b 100644
--- a/Resources/Prototypes/_Mono/Research/shuttlecomps.yml
+++ b/Resources/Prototypes/_Mono/Research/shuttlecomps.yml
@@ -2,7 +2,7 @@
   id: ShuttleAdvancedComponents
   name: research-technology-shuttle-advanced-components
   entityIcon: ComputerAdvancedRadar
-  discipline: CivilianServices
+  discipline: Industrial # LuaM: CivilianServices > Industrial
   tier: 3
   cost: 55000
   recipeUnlocks:
@@ -19,14 +19,13 @@
   technologyPrerequisites:
   - Shuttlecraft
   - SuperParts
-  position: -6, 7
-
+  position: 6, 11
 
 - type: technology
   id: ShuttleCtlaAdvancedDriveResearch
   name: research-technology-bluespace-drive-ctla-advanced
   entityIcon: MachineFTLDrive50
-  discipline: Experimental
+  discipline: Industrial # LuaM: CivilianServices > Industrial
   tier: 3
   cost: 45000
   recipeUnlocks:
@@ -34,5 +33,5 @@
   - MachineDriveCTLA50Circuitboard
   technologyPrerequisites:
   - ShuttleAdvancedComponents
-  - PortableFission
-  position: -6, 9
+#  - PortableFission # Commented by LuaM
+  position: 6, 10
diff --git a/Resources/Prototypes/_Mono/disciplines.yml b/Resources/Prototypes/_Mono/disciplines.yml
index 30c2537adff..5e2613f79bb 100644
--- a/Resources/Prototypes/_Mono/disciplines.yml
+++ b/Resources/Prototypes/_Mono/disciplines.yml
@@ -9,7 +9,7 @@
     1: 0
     2: 0.5
     3: 0.5
-  uiName: MCH
+  uiName: research-discipline-mechs # LuaM: MCH > research-discipline-mechs
 
 - type: techDiscipline
   id: FactionUniversal
@@ -22,7 +22,7 @@
     1: 0
     2: 0.75
     3: 0.75
-  uiName: UNV
+  uiName: research-discipline-faction-universal # LuaM: UNV > research-discipline-faction-universal
 
 - type: techDiscipline
   id: TsfmcWeaponry
@@ -35,7 +35,7 @@
     1: 0
     2: 0.75
     3: 0.75
-  uiName: TSF-WP
+  uiName: research-discipline-tsfmc-weaponry # LuaM: TSF-WP > research-discipline-tsfmc-weaponry
 
 - type: techDiscipline
   id: TsfmcGear
@@ -48,7 +48,7 @@
     1: 0
     2: 0.5
     3: 0.5
-  uiName: TSF-GR
+  uiName: research-discipline-tsfmc-gear # LuaM: TSF-GR > research-discipline-tsfmc-gear
 
 - type: techDiscipline
   id: TsfmcEquipment
@@ -61,7 +61,7 @@
     1: 0
     2: 0.5
     3: 0.5
-  uiName: TSF-EQ
+  uiName: research-discipline-tsfmc-equipment # LuaM: TSF-EQ > research-discipline-tsfmc-equipment
 
 - type: techDiscipline
   id: TsfmcShipyard
@@ -74,7 +74,7 @@
     1: 0
     2: 0.5
     3: 0.5
-  uiName: TSF-HI
+  uiName: research-discipline-tsfmc-shipyard # LuaM: TSF-HI > research-discipline-tsfmc-shipyard
 
 - type: techDiscipline
   id: RogueWeaponry
@@ -87,7 +87,7 @@
     1: 0
     2: 0.75
     3: 0.75
-  uiName: PDV-WP
+  uiName: research-discipline-rogue-weaponry # LuaM: PDV-WP > research-discipline-rogue-weaponry
 
 - type: techDiscipline
   id: RogueGear
@@ -100,7 +100,7 @@
     1: 0
     2: 0.5
     3: 0.5
-  uiName: PDV-GR
+  uiName: research-discipline-rogue-gear # LuaM: PDV-GR > research-discipline-rogue-gear
 
 - type: techDiscipline
   id: RogueEquipment
@@ -113,7 +113,7 @@
     1: 0
     2: 0.5
     3: 0.5
-  uiName: PDV-EQ
+  uiName: research-discipline-rogue-equipment # LuaM: PDV-EQ > research-discipline-rogue-equipment
 
 - type: techDiscipline
   id: RogueShipyard
@@ -126,7 +126,7 @@
     1: 0
     2: 0.5
     3: 0.
-  uiName: PDV-HI
+  uiName: research-discipline-rogue-shipyard # LuaM: PDV-HI > research-discipline-rogue-shipyard
 
 - type: techDiscipline
   id: Ussp
@@ -139,7 +139,7 @@
     1: 0
     2: 0.50
     3: 0.50
-  uiName: USSP
+  uiName: research-discipline-ussp # LuaM: USSP > research-discipline-ussp
 
 - type: techDiscipline
   id: UsspShipyard
@@ -152,7 +152,7 @@
     1: 0
     2: 0.50
     3: 0.50
-  uiName: USSP-HI
+  uiName: research-discipline-ussp-shipyard # LuaM: USSP-HI > research-discipline-ussp-shipyard
 
 - type: techDiscipline
   id: UsspEquipment
@@ -165,7 +165,7 @@
     1: 0
     2: 0.50
     3: 0.50
-  uiName: USSP-EQ
+  uiName: research-discipline-ussp-equipment # LuaM: USSP-EQ > research-discipline-ussp-equipment
 
 - type: techDiscipline
   id: UsspWeapons
@@ -178,7 +178,7 @@
     1: 0
     2: 0.75
     3: 0.75
-  uiName: USSP-WP
+  uiName: research-discipline-ussp-weaponry # LuaM: USSP-WP > research-discipline-ussp-weaponry
 
 - type: techDiscipline
   id: ViperGroup
@@ -191,4 +191,4 @@
     1: 0
     2: 0.5
     3: 0.5
-  uiName: VG
+  uiName: research-discipline-viper-group #LuaM: VG > research-discipline-viper-group
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index ddac8959f5b..760ff20596f 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -222,6 +222,11 @@
     - SecurityEquipment
     - SmartGun #Smart SMG
     # Mono end
+# LuaM-start:
+    - ArmorBasic
+    - ArmorAdvanced
+    - PunkGear
+# LuaM-end.
   - type: EmagLatheRecipes
     emagStaticPacks:
     - NFMercenaryTechfabDeprecatedEmag
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml
index 7f2116bdf0f..72e634419ef 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/hacked_mercenary_techfab.yml
@@ -95,8 +95,8 @@
 # Mercenary techfab
 ## Armor
   - TelescopicShield
-  - ClothingOuterArmorBulletproofNF
-  - ClothingOuterCoatBHTrench
+#  - ClothingOuterArmorBulletproofNF # Commented by LuaM
+#  - ClothingOuterCoatBHTrench # Commented by LuaM
 ## EVA / Hardsuits
   - ClothingOuterHardsuitCap
   - ClothingOuterHardsuitMercenary
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml
index 7830e676db1..191d17ec281 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/Packs/Deprecated/mercenary_techfab.yml
@@ -47,10 +47,10 @@
   - ClothingNeckIFFBlue
   - ClothingNeckIFFOrange
   - ClothingNeckIFFPurple
-  - ClothingHeadHelmetMercenary
-  - ClothingHeadHelmetBasic
-  - ClothingOuterVestWebMercenary
-  - ClothingOuterVestWebMercenaryBlack
+#  - ClothingHeadHelmetMercenary # Commented by LuaM
+#  - ClothingHeadHelmetBasic # Commented by LuaM
+#  - ClothingOuterVestWebMercenary # Commented by LuaM
+#  - ClothingOuterVestWebMercenaryBlack # Commented by LuaM
   - ClothingBeltMercenaryWebbing
   - ClothingBeltMilitaryWebbing
   - ClothingHandsMercenaryGlovesCombat
@@ -119,24 +119,24 @@
   - ArmorPlateHeat #Mono
   - ArmorPlateSpeed #Mono
   - TelescopicShield
-  - ClothingOuterArmorBulletproofNF
-  - ClothingOuterCoatBHTrench
-  - ClothingOuterArmorPunkRandomized
-  - ClothingOuterArmorPunkRed
-  - ClothingOuterArmorPunkGreen
-  - ClothingOuterArmorPunkOrange
-  - ClothingOuterArmorElitePunkRandomized
-  - ClothingBeltPunkRandomized
-  - ClothingShoesBootsPunkRandomized
-  - ClothingEyesPunkGoggles
-  - ClothingEyesPunkInfoShades
-  - ClothingMaskPunkHalf
-  - ClothingUniformRandomPunkTanktop
-  - ClothingUniformRandomPunkTanktopShorts
-  - ClothingUniformRandomPunkCroptop
-  - ClothingUniformRandomPunkCroptopShorts
-  - ClothingOuterCoatLettermanRandomized
-  - ClothingOuterCoatBomberRandomized
+#  - ClothingOuterArmorBulletproofNF # Commented by LuaM
+#  - ClothingOuterCoatBHTrench # Commented by LuaM
+#  - ClothingOuterArmorPunkRandomized # Commented by LuaM
+#  - ClothingOuterArmorPunkRed # Commented by LuaM
+#  - ClothingOuterArmorPunkGreen # Commented by LuaM
+#  - ClothingOuterArmorPunkOrange # Commented by LuaM
+#  - ClothingOuterArmorElitePunkRandomized # Commented by LuaM
+#  - ClothingBeltPunkRandomized # Commented by LuaM
+#  - ClothingShoesBootsPunkRandomized # Commented by LuaM
+#  - ClothingEyesPunkGoggles # Commented by LuaM
+#  - ClothingEyesPunkInfoShades # Commented by LuaM
+#  - ClothingMaskPunkHalf # Commented by LuaM
+#  - ClothingUniformRandomPunkTanktop # Commented by LuaM
+#  - ClothingUniformRandomPunkTanktopShorts # Commented by LuaM
+#  - ClothingUniformRandomPunkCroptop # Commented by LuaM
+#  - ClothingUniformRandomPunkCroptopShorts # Commented by LuaM
+#  - ClothingOuterCoatLettermanRandomized # Commented by LuaM
+#  - ClothingOuterCoatBomberRandomized # Commented by LuaM
 ## EVA / Hardsuits
   - ClothingOuterHardsuitCap
   - ClothingOuterHardsuitMercenary
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/clothing-armor.yml b/Resources/Prototypes/_NF/Recipes/Lathes/clothing-armor.yml
index adc7208e30b..ed35075eb22 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/clothing-armor.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/clothing-armor.yml
@@ -67,11 +67,17 @@
     Durathread: 500
     Steel: 300
     Plasteel: 1000
+    Plastic: 300 # LuaM
 
 - type: latheRecipe
   id: ClothingOuterCoatBHTrench
   parent: NFBaseArmorRecipe
   result: ClothingOuterCoatBHTrench
+  materials: # LuaM
+    Durathread: 750
+    Cloth: 750
+    Plasteel: 650
+    Plastic: 300
 
 - type: latheRecipe
   id: ClothingOuterArmorPunkRandomized
@@ -103,6 +109,7 @@
     Durathread: 500
     Steel: 300
     Plasteel: 1000
+    Plastic: 300 # LuaM
 
 # Masks
 - type: latheRecipe
diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml
index 7af03c3ef78..2484ed30463 100644
--- a/Resources/Prototypes/_NF/Research/arsenal.yml
+++ b/Resources/Prototypes/_NF/Research/arsenal.yml
@@ -4,7 +4,7 @@
 - type: technology
   id: BountyHunting
   name: research-technology-bounty-hunting
-  entityIcon: ClothingOuterCoatBHTrench
+  entityIcon: Bola # LuaM: ClothingOuterCoatBHTrench > Bola
   discipline: Arsenal
   tier: 1
   cost: 10000
@@ -12,8 +12,8 @@
   - Stunbaton
   - BolaNF
   - Handcuffs
-  - ClothingOuterArmorBulletproofNF
-  - ClothingOuterCoatBHTrench
+#  - ClothingOuterArmorBulletproofNF # Commented by LuaM
+#  - ClothingOuterCoatBHTrench # Commented by LuaM
   - PinpointerUniversalNF
   - ClothingEyesHudBountyHunter
   # - WeaponShotgunKammererNF # _Mono: Moved to merc weapon research
@@ -22,26 +22,26 @@
   - KatanaNF
   - KukriKnifeNF
   - MacheteNF
-  - ClothingEyesPunkInfoShades
-  - ClothingOuterArmorPunkRandomized
-  - ClothingOuterArmorPunkRed
-  - ClothingOuterArmorPunkGreen
-  - ClothingOuterArmorPunkOrange
-  - ClothingOuterArmorElitePunkRandomized
-  - ClothingBeltPunkRandomized
-  - ClothingShoesBootsPunkRandomized
-  - ClothingEyesPunkGoggles
-  - ClothingEyesPunkInfoShades
-  - ClothingMaskPunkHalf
-  - ClothingUniformRandomPunkTanktop
-  - ClothingUniformRandomPunkTanktopShorts
-  - ClothingUniformRandomPunkCroptop
-  - ClothingUniformRandomPunkCroptopShorts
-  - ClothingOuterCoatLettermanRandomized
-  - ClothingOuterCoatBomberRandomized
+#  - ClothingEyesPunkInfoShades # Commented by LuaM
+#  - ClothingOuterArmorPunkRandomized # Commented by LuaM
+#  - ClothingOuterArmorPunkRed # Commented by LuaM
+#  - ClothingOuterArmorPunkGreen # Commented by LuaM
+#  - ClothingOuterArmorPunkOrange # Commented by LuaM
+#  - ClothingOuterArmorElitePunkRandomized # Commented by LuaM
+#  - ClothingBeltPunkRandomized # Commented by LuaM
+#  - ClothingShoesBootsPunkRandomized # Commented by LuaM
+#  - ClothingEyesPunkGoggles # Commented by LuaM
+#  - ClothingEyesPunkInfoShades # Commented by LuaM
+#  - ClothingMaskPunkHalf # Commented by LuaM
+#  - ClothingUniformRandomPunkTanktop # Commented by LuaM
+#  - ClothingUniformRandomPunkTanktopShorts # Commented by LuaM
+#  - ClothingUniformRandomPunkCroptop # Commented by LuaM
+#  - ClothingUniformRandomPunkCroptopShorts # Commented by LuaM
+#  - ClothingOuterCoatLettermanRandomized # Commented by LuaM 
+#  - ClothingOuterCoatBomberRandomized # Commented by LuaM
   technologyPrerequisites:
   - AdvancedRiotControl
-  position: 3, 2
+  position: 7, 12
 
 # Tier 2
 
@@ -49,7 +49,7 @@
   id: MagnetsTechCombat
   name: research-technology-magnets-tech-combat
   entityIcon: ClothingShoesBootsMagSecurity
-  discipline: Experimental
+  discipline: Arsenal # LuaM: Experimental > Arsenal
   tier: 1
   cost: 10000
   recipeUnlocks:
@@ -57,8 +57,8 @@
   - ClothingShoesBootsMagMercenary
   technologyPrerequisites:
   - MagnetsTech
-  - AdvancedParts
-  position: -3, -1
+#  - AdvancedParts # Commented by LuaM
+  position: 4, 13
 
 - type: technology
   id: HardsuitsArmored
@@ -71,9 +71,10 @@
   - ClothingOuterHardsuitMercenary
   - ClothingOuterHardsuitPrivateSecurity
   technologyPrerequisites:
-  - HardsuitsSpecialized
+  - MagnetsTechCombat # LuaM: HardsuitsSpecialized > MagnetsTechCombat
   - HardsuitsAdvanced
-  position: 2, 8
+  - ArmorAdvanced # LuaM
+  position: 4, 10
 
 # Mono edit - research consolidation
 # - type: technology
@@ -124,4 +125,4 @@
   technologyPrerequisites:
   - HardsuitsArmored
   - SuperParts
-  position: 3, 7
+  position: 4, 7
diff --git a/Resources/Prototypes/_NF/Research/civilianservices.yml b/Resources/Prototypes/_NF/Research/civilianservices.yml
index fe1ed572f76..de1278f0a55 100644
--- a/Resources/Prototypes/_NF/Research/civilianservices.yml
+++ b/Resources/Prototypes/_NF/Research/civilianservices.yml
@@ -19,7 +19,7 @@
   - ElectricRangeMachineCircuitboard # Mono
   technologyPrerequisites:
   - BasicParts
-  position: 3, -2
+  position: 3, 13
 
 - type: technology
   id: MiscellaneousItemsOrganization
@@ -50,7 +50,7 @@
   - MedicalPouch # LuaM add
   technologyPrerequisites:
   - BasicParts
-  position: 3, -3
+  position: 12, 13
 
 # Tier 2
 
@@ -88,20 +88,21 @@
   - BiomassReclaimerMachineCircuitboard
   technologyPrerequisites:
   - AdvancedParts
-  position: -2, 10
+  position: 8, 12
 
 - type: technology
   id: AdvancedPersonalPropulsion
   name: research-technology-advanced-personal-propulsion
   entityIcon: JetpackVoid
-  discipline: CivilianServices
+  discipline: Industrial # CivilianServices # LuaM: CivilianServices > Industrial
   tier: 2 # 3->2 - Mono
   cost: 15000
   recipeUnlocks:
   - JetpackVoid
   technologyPrerequisites:
   - Shuttlecraft
-  position: -4, 7
+  - HardsuitsSpecialized # LuaM
+  position: 7, 9
 
 # Mono edit - research consolidation
 # - type: technology
diff --git a/Resources/Prototypes/_NF/Research/experimental.yml b/Resources/Prototypes/_NF/Research/experimental.yml
index d0928a5a0c3..cfa6cf3ecb5 100644
--- a/Resources/Prototypes/_NF/Research/experimental.yml
+++ b/Resources/Prototypes/_NF/Research/experimental.yml
@@ -33,7 +33,7 @@
   - NFBlueprintSuperMatterBinStockPart
   technologyPrerequisites:
   - AdvancedParts
-  position: 0, 16
+  position: 8, 4
 
 - type: technology
   id: MagnetsTechAdvanced
@@ -46,9 +46,9 @@
   - ClothingShoesBootsMagAdv
   - NFBlueprintClothingShoesBootsMagAdv
   technologyPrerequisites:
-  - MagnetsTechCombat
+  - MagnetsTech # LuaM: > MagnetsTechCombat > MagnetsTech
   - SuperParts
-  position: -4, -1
+  position: 5, 6
 
 # Mono edit - research consolidation
 # - type: technology
diff --git a/Resources/Prototypes/_NF/Research/industrial.yml b/Resources/Prototypes/_NF/Research/industrial.yml
index ec122054f7e..4d62c4e4003 100644
--- a/Resources/Prototypes/_NF/Research/industrial.yml
+++ b/Resources/Prototypes/_NF/Research/industrial.yml
@@ -12,7 +12,8 @@
   - NFBlueprintConstructionBagOfHolding
   technologyPrerequisites:
   - AdvancedToolsTechnology
-  position: -2, 18
+  - HardsuitsAdvanced # LuaM
+  position: 6, 5
 
 # - type: technology
 #   id: HardsuitsBasic
@@ -34,7 +35,7 @@
   entityIcon: ClothingOuterHardsuitEngineering
   discipline: Industrial
   tier: 2
-  cost: 17500
+  cost: 15000 # LuaM: 17500 > 15000
   recipeUnlocks:
   - ClothingOuterHardsuitBasic
   - ClothingOuterHardsuitAtmos
@@ -53,7 +54,7 @@
   - ModsuitCoreStandard
   technologyPrerequisites:
   - AdvancedParts
-  position: 1, 8
+  position: 8, 13
 
 # Tier 2
 
@@ -75,7 +76,7 @@
   - ClothingOuterHardsuitRd
   technologyPrerequisites:
   - HardsuitsSpecialized
-  position: 1, 7
+  position: 8, 7
 
 # Tier 3
 
diff --git a/Resources/Prototypes/_Shitmed/Research/civilianservices.yml b/Resources/Prototypes/_Shitmed/Research/civilianservices.yml
index 0120b634056..ff9a27132b6 100644
--- a/Resources/Prototypes/_Shitmed/Research/civilianservices.yml
+++ b/Resources/Prototypes/_Shitmed/Research/civilianservices.yml
@@ -15,5 +15,6 @@
   - ShitmedOmnimedTool
   - AutodocCircuitboard
   technologyPrerequisites:
+  - AdvancedTreatment # LuaM
   - CyberneticOrgans # LuaM: CyberneticEnhancements > CyberneticOrgans
-  position: -1, 11 # LuaM: -2, 13 > -1, 11
+  position: 7, 5
diff --git a/Resources/Prototypes/_White/Research/experimental.yml b/Resources/Prototypes/_White/Research/experimental.yml
index c4bb3cff04a..3acb0a062d5 100644
--- a/Resources/Prototypes/_White/Research/experimental.yml
+++ b/Resources/Prototypes/_White/Research/experimental.yml
@@ -6,13 +6,13 @@
   entityIcon: ClothingEyesNightVisionGoggles
   discipline: Experimental
   tier: 2
-  cost: 20000
+  cost: 15000 # LuaM: 20000 > 15000
   recipeUnlocks:
   - ClothingEyesNightVisionGoggles
   - ClothingHelmetAttachmentNVGsBasic
   technologyPrerequisites:
   - SuperParts
-  position: 1, 15
+  position: 10, 4
 
 - type: technology
   id: ThermalVisionTech
@@ -20,10 +20,10 @@
   entityIcon: ClothingEyesThermalVisionGoggles
   discipline: Experimental
   tier: 2
-  cost: 15000
+  cost: 25000 # LuaM: 15000 > 25000
   recipeUnlocks:
   - ClothingEyesThermalVisionGoggles
   - ClothingHelmetAttachmentInfraredBasic
   technologyPrerequisites:
   - NightVisionTech
-  position: 2, 15
+  position: 11, 4

From 0eb668e06a496d63256458da921028dae8f58bc7 Mon Sep 17 00:00:00 2001
From: Pcol <mandarincik3000@gmail.com>
Date: Tue, 4 Aug 2026 21:56:59 +0300
Subject: [PATCH 2/3] Fix1

---
 .../Prototypes/_LuaM/Recipes/Lathes/Packs/circuitboard.yml        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename "Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/\321\201ircuitboard.yml" => Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/circuitboard.yml (100%)

diff --git "a/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/\321\201ircuitboard.yml" b/Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/circuitboard.yml
similarity index 100%
rename from "Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/\321\201ircuitboard.yml"
rename to Resources/Prototypes/_LuaM/Recipes/Lathes/Packs/circuitboard.yml

From 06a6b73cd9e0d78ecb7846c7aeb344cd49778eaa Mon Sep 17 00:00:00 2001
From: Pcol <mandarincik3000@gmail.com>
Date: Tue, 4 Aug 2026 22:04:05 +0300
Subject: [PATCH 3/3] Fix2

---
 .../_Mono/Entities/Objects/Electronics/datafarms.yml      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml b/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml
index fd6c4a88c89..ec3ed76af85 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Electronics/datafarms.yml
@@ -19,10 +19,10 @@
       ResearchDisk10000:
         amount: 2
         defaultPrototype: ResearchDisk10000
-  - type: Construction
-    deconstructionTarget: null
-    graph: Datafarm
-    node: research
+#  - type: Construction # Commented by LuaM
+#    deconstructionTarget: null
+#    graph: Datafarm
+#    node: research
 
 - type: entity
   id: DataFarmCryptoCircuitboard