diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index bfc94f2b702..983be0ba370 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -178,6 +178,7 @@
     - Wirecutter
     - Multitool
     - WelderIndustrial
+    - MaintenanceJack # Frontier
 
 # cargo modules
 - type: entity
@@ -243,6 +244,7 @@
     - RemoteSignaller
     - GasAnalyzer
     - GeigerCounter
+    - MaintenanceJack # Frontier
 
 - type: entity
   id: BorgModuleConstruction
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index c8a3f152521..5cff8250734 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -706,6 +706,8 @@
     - BorgModuleDiagnosis
     - BorgModuleDefibrillator
     - BorgModuleAdvancedTreatment
+    - BorgModuleAdvancedParamedic # Frontier
+    - BorgModuleAdvancedMining # Frontier
     - RipleyHarness
     - RipleyLArm
     - RipleyRArm
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 82a81da473d..3e9b15b93f1 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -164,6 +164,7 @@
   recipeUnlocks:
   - BorgModuleAdvancedTreatment
   - BorgModuleDefibrillator
+  - BorgModuleAdvancedParamedic # Frontier
 
 - type: technology
   id: AdvancedCleaning
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index bee26c204f5..c1b61e7576e 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -193,6 +193,7 @@
     - NFBlueprintOreBagOfHolding # Frontier
     - NFBlueprintMiningDrillDiamond # Frontier
     - NFBlueprintAdvancedMineralScannerEmpty # Frontier
+    - BorgModuleAdvancedMining # Frontier
 
 # Tier 3
 
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/healing.yml
new file mode 100644
index 00000000000..f2c5242b105
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/healing.yml
@@ -0,0 +1,17 @@
+- type: entity
+  id: Suture10Lingering
+  parent: MedicatedSuture
+  suffix: 10, Lingering
+  components:
+  - type: Stack
+    lingering: true
+    count: 10
+
+- type: entity
+  id: Mesh10Lingering
+  parent: RegenerativeMesh
+  suffix: 10, Lingering
+  components:
+  - type: Stack
+    lingering: true
+    count: 10
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml
new file mode 100644
index 00000000000..2b55fc1dfc6
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -0,0 +1,37 @@
+- type: entity
+  id: BorgModuleAdvancedMining
+  parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
+  name: advanced mining cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: cargo
+    - state: icon-advancedmining
+      sprite: _NF/Objects/Specific/Robotics/borgmodule.rsi
+  - type: ItemBorgModule
+    items:
+    - MiningDrillDiamond
+    - Shovel
+    - AdvancedMineralScannerUnpowered
+    - OreBagOfHolding
+    - JawsOfLife
+    - RadioHandheldNF
+
+- type: entity
+  id: BorgModuleAdvancedParamedic
+  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
+  name: advanced paramedic cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: medical
+    - state: icon-paramedic
+      sprite: _NF/Objects/Specific/Robotics/borgmodule.rsi
+  - type: ItemBorgModule
+    items:
+    - HandheldHealthAnalyzerUnpowered
+    - Suture10Lingering
+    - Mesh10Lingering
+    - Gauze10Lingering
+    - Bloodpack10Lingering
+    - SyringeBluespace
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml
new file mode 100644
index 00000000000..1dab1a72ea2
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml
@@ -0,0 +1,23 @@
+- type: latheRecipe
+  id: BorgModuleAdvancedParamedic
+  result: BorgModuleAdvancedParamedic
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Gold: 50
+    Bluespace: 60 # SyringeBluespace Bluepsace price
+
+- type: latheRecipe
+  id: BorgModuleAdvancedMining
+  result: BorgModuleAdvancedMining
+  category: Robotics
+  completetime: 3
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Bluespace: 200 # OreBagOfHolding Bluepsace price
+    Diamond: 100 # MiningDrillDiamond Diamond price
diff --git a/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-advancedmining.png b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-advancedmining.png
new file mode 100644
index 00000000000..1610b23a43b
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-advancedmining.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-paramedic.png b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-paramedic.png
new file mode 100644
index 00000000000..9116ed8d125
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-paramedic.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/meta.json
new file mode 100644
index 00000000000..fd70cf73cf1
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Made by GhostPrince for Frontier Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon-advancedmining"
+        },
+        {
+            "name": "icon-paramedic"
+        }
+    ]
+}