diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index dc98780792..f99b9cf074 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -197,6 +197,7 @@
         - ReagentId: Carbon
           Quantity: 0.5
         canReact: false
+        
 - type: entity
   parent: SheetGlassBase
   id: SheetPGlass
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 5bdaddda23..56fe96973d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -205,6 +205,7 @@
     - Shovel
     - OreBag
     - Crowbar
+    - RadioHandheld
 
 - type: entity
   id: BorgModuleGrapplingGun
@@ -219,6 +220,7 @@
     items:
     - WeaponGrapplingGun
     - WeaponCrusherDagger
+    - HandheldGPSBasic
 
 # engineering modules
 - type: entity
@@ -235,22 +237,9 @@
     - Omnitool
     - WelderExperimental
     - NetworkConfigurator
-
-- type: entity
-  id: BorgModuleGasAnalyzer
-  parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ]
-  name: gas analyzer cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: engineering
-    - state: icon-gas-analyzer
-  - type: ItemBorgModule
-    items:
-    - GasAnalyzer
-    - trayScanner
-    - Crowbar
-    - Wrench
+    - RemoteSignaller
+    - GasAnalyzer   
+    - GeigerCounter
 
 - type: entity
   id: BorgModuleConstruction
@@ -326,6 +315,7 @@
     - AdvMopItem
     - HoloprojectorBorg
     - SprayBottleSpaceCleaner
+    - Dropper
 
 # medical modules
 - type: entity
@@ -437,7 +427,7 @@
     - HandLabeler
     - Lighter
     - DrinkShaker
-    - Syringe
+    - BorgDropper
 
 - type: entity
   id: BorgModuleMusique
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 71c8c38cc2..f22c420eae 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -530,7 +530,6 @@
     - BorgModuleAdvancedCleaning
     - BorgModuleMining
     - BorgModuleGrapplingGun
-    - BorgModuleGasAnalyzer
     - BorgModuleAdvancedTool
     - BorgModuleRCD
     - BorgModuleArtifact
diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index 1d840e3b4c..44a9e2f0f2 100644
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -459,16 +459,6 @@
     Glass: 500
     Plastic: 250
 
-- type: latheRecipe
-  id: BorgModuleGasAnalyzer
-  result: BorgModuleGasAnalyzer
-  category: Robotics
-  completetime: 3
-  materials:
-    Steel: 250
-    Glass: 250
-    Plastic: 250
-
 - type: latheRecipe
   id: BorgModuleRCD
   result: BorgModuleRCD
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 529c9ebd64..19295948a4 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -82,7 +82,6 @@
   tier: 1
   cost: 7500
   recipeUnlocks:
-  - BorgModuleGasAnalyzer
   - ThermomachineFreezerMachineCircuitBoard
   - GasRecyclerMachineCircuitboard