From 97ff2c1d67eb636745bcf820df2c30baa09228c0 Mon Sep 17 00:00:00 2001
From: thoughtlessuser <thoughtlessuser@gmail.com>
Date: Mon, 13 Jul 2026 19:07:29 -0500
Subject: [PATCH 1/9] borgupdate

---
 Resources/Maps/Dungeon/mineshaft.yml          |   2 +-
 Resources/Maps/_NF/Dungeon/mineshaft.yml      |   2 +-
 .../Spawners/Random/Department/science.yml    |   2 +-
 .../Entities/Mobs/Cyborgs/borg_chassis.yml    |   2 +-
 .../Entities/Mobs/Player/silicon.yml          |   2 +-
 .../Objects/Consumable/Drinks/drinks.yml      |  10 +
 .../Consumable/Drinks/drinks_special.yml      |  11 +
 .../Objects/Materials/Sheets/metal.yml        |   3 +
 .../Medical/handheld_crew_monitor.yml         |  13 +
 .../Objects/Specific/Medical/morgue.yml       |   3 +
 .../Specific/Robotics/borg_modules.yml        | 459 +++++++++++-------
 .../Structures/Furniture/rollerbeds.yml       |   3 +
 .../Recipes/Lathes/Packs/robotics.yml         |   4 +-
 .../Prototypes/Recipes/Lathes/robotics.yml    |  10 +-
 Resources/Prototypes/Research/industrial.yml  |   2 +-
 .../_Mono/Entities/Mobs/Player/silicon.yml    |   2 +-
 .../Consumable/Drinks/drinks_bottles.yml      |  72 ++-
 .../Objects/Specific/Medical/hypospray.yml    |  28 ++
 .../Objects/Specific/Medical/surgery.yml      |  58 +++
 .../Specific/Robotics/borg_modules.yml        |  52 ++
 .../_Mono/Entities/Objects/Tools/repair.yml   |   4 +-
 .../_Mono/Entities/Objects/Tools/tools.yml    |  13 +
 Resources/Prototypes/_Mono/borg_types.yml     |  18 +-
 Resources/Prototypes/_Mono/tags.yml           |  11 +
 .../Objects/Specific/chemical-containers.yml  |   2 +-
 Resources/Prototypes/borg_types.yml           |   8 +
 .../ServerInfo/Guidebook/Science/Cyborgs.xml  |   2 +-
 .../Actions/actions_borg.rsi/meta.json        |   5 +-
 .../Actions/actions_borg.rsi/paper-module.png | Bin 0 -> 711 bytes
 .../Robotics/borgmodule.rsi/icon-bartend.png  | Bin 0 -> 196 bytes
 .../Robotics/borgmodule.rsi/meta.json         |   5 +-
 .../actions_borg.rsi/cold-storage-module.png  | Bin 0 -> 607 bytes
 .../khorpeks-surgery-module.png               | Bin 0 -> 746 bytes
 .../Action/actions_borg.rsi/meta.json         |   8 +-
 .../borgmodule.rsi/icon-khorpeks-surgery.png  | Bin 0 -> 251 bytes
 .../Robotics/borgmodule.rsi/meta.json         |   5 +-
 36 files changed, 609 insertions(+), 212 deletions(-)
 create mode 100644 Resources/Prototypes/_Mono/Entities/Objects/Specific/Medical/hypospray.yml
 create mode 100644 Resources/Prototypes/_Mono/Entities/Objects/Specific/Medical/surgery.yml
 create mode 100644 Resources/Prototypes/_Mono/Entities/Objects/Tools/tools.yml
 create mode 100644 Resources/Textures/Interface/Actions/actions_borg.rsi/paper-module.png
 create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-bartend.png
 create mode 100644 Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/cold-storage-module.png
 create mode 100644 Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/khorpeks-surgery-module.png
 create mode 100644 Resources/Textures/_Mono/Objects/Specific/Robotics/borgmodule.rsi/icon-khorpeks-surgery.png

diff --git a/Resources/Maps/Dungeon/mineshaft.yml b/Resources/Maps/Dungeon/mineshaft.yml
index df006c1e63f..c3d02520896 100644
--- a/Resources/Maps/Dungeon/mineshaft.yml
+++ b/Resources/Maps/Dungeon/mineshaft.yml
@@ -528,7 +528,7 @@ entities:
     - type: Transform
       pos: 24.5,32.5
       parent: 2
-- proto: BorgModuleGPS
+- proto: BorgModuleSurveillance
   entities:
   - uid: 800
     components:
diff --git a/Resources/Maps/_NF/Dungeon/mineshaft.yml b/Resources/Maps/_NF/Dungeon/mineshaft.yml
index 5bf25d55210..bedf5205645 100644
--- a/Resources/Maps/_NF/Dungeon/mineshaft.yml
+++ b/Resources/Maps/_NF/Dungeon/mineshaft.yml
@@ -522,7 +522,7 @@ entities:
     - type: Transform
       pos: 24.5,32.5
       parent: 2
-- proto: BorgModuleGPS
+- proto: BorgModuleSurveillance
   entities:
   - uid: 800
     components:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
index 18b8bd20fd9..a5f0a1f2737 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
@@ -116,7 +116,7 @@
     prototypes:
     - BorgModuleCable
     - BorgModuleFireExtinguisher
-    - BorgModuleGPS
+    - BorgModuleSurveillance
     - BorgModuleRadiationDetection
     - BorgModuleTool
     - BorgModuleArtifact
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 2ded6c61efb..f1999ffe7cf 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -99,7 +99,7 @@
     selectedBorgType: service
   - type: BorgSwitchableSubtype # Goobstation
     borgSubtype: default_service
-
+  
 - type: entity
   id: BorgChassisSyndicateAssault
   parent: BaseBorgChassisSyndicate
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index 182270e915e..32e7501dcee 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -684,7 +684,7 @@
         - BorgModuleTool
         # - BorgModuleFireExtinguisher # Frontier
         - BorgModuleJetpack # Frontier
-        - BorgModuleGPS
+        - BorgModuleSurveillance
   - type: ItemSlots
     slots:
       cell_slot:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index d59afbd1044..a7a5be6f648 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -100,6 +100,11 @@
   parent: DrinkGlassBase
   id: DrinkGlass
   components:
+  # Mono tag
+  - type: Tag
+    tags:
+    - Bartending
+  # tag end
   - type: Sprite
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
     layers:
@@ -130,6 +135,11 @@
   parent: DrinkGlassBase
   id: DrinkGlassCoupeShaped
   components:
+  # Mono tag
+    - type: Tag
+      tags:
+      - Bartending
+  # tag end
     - type: Sprite
       sprite: Objects/Consumable/Drinks/glass_coupe_shape.rsi
       layers:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index bd69778d3d5..a8f345a30ad 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -4,6 +4,11 @@
   name: shaker
   description: The trusty mixing buddy of the bartender.
   components:
+  # Mono tag
+  - type: Tag
+    tags:
+    - Bartending
+  # tag end
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -71,6 +76,12 @@
     fillBaseName: fill
     inHandsMaxFillLevels: 1
     inHandsFillBaseName: -fill-
+  # Mono tag
+  addComponent:
+  - type: Tag
+    tags:
+    - Bartending
+  # tag end
 
 - type: entity
   parent: DrinkGlassBase
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 0271a8d0f68..2c7faa13549 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -112,6 +112,9 @@
   - type: Stack
     lingering: true
     count: 0
+  - type: Tag
+    tags:
+    - SheetsBorg
 
 - type: entity
   parent: SheetMetalBase
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
index d4318621323..f28e4b79dc0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -39,3 +39,16 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
+
+- type: entity # Mono
+  id: HandheldCrewMonitorBorg
+  parent: HandheldCrewMonitor
+  suffix: Borg
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMicroreactor
+        disableEject: true
+        swap: false
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 8455d4d7b17..66aec537c43 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -98,6 +98,9 @@
   parent: [BodyBag, RecyclableItemPlasticMedium] # Frontier: added RecyclableItemPlasticMedium
   suffix: folded
   components:
+  - type: Tag
+    tags:
+    - FoldedBodyBag # Mono
   - type: Foldable
     folded: true
 #  - type: BodyBagItem #TODO: we need some kind of generic placable, like thus:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index ac838ef7672..0a2d119e73f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1,3 +1,5 @@
+# Mono: Added a description to each individual cyborg module because I'm a masochist.
+
 - type: entity
   id: BaseBorgModule
   parent: BaseItem
@@ -109,6 +111,7 @@
   id: BorgModuleCable
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: cable cyborg module
+  description: Enables the storage of cables for a cyborg chassis.
   components:
   - type: Sprite
     layers:
@@ -120,7 +123,7 @@
     - CableApcStackLingering10
     - CableMVStackLingering10
     - CableHVStackLingering10
-    - Wirecutter
+#    - Wirecutter
     - trayScanner
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: wire-module }
@@ -129,6 +132,7 @@
   id: BorgModuleFireExtinguisher
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: fire extinguisher cyborg module
+  description: Allows a cyborg chassis to utilize a fire extinguisher.
   components:
   - type: Sprite
     layers:
@@ -150,43 +154,48 @@
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: extinguisher-module }
 
 - type: entity
-  id: BorgModuleGPS
+  id: BorgModuleSurveillance # GPS->Surveillance for soul / Mono
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
-  name: GPS cyborg module
+  name: surveillance cyborg module # GPS->Surveillance for soul / Mono
+  description: Vital for cyborgs- The surveillance module provides a plethora of information to a cyborg and enhances functionality.
   components:
   - type: Sprite
     layers:
     - state: generic
     - state: icon-gps
   - type: ItemBorgModule
-    moduleId: GPS # Frontier
+    moduleId: Surveillance # mono
     items:
+    - GeigerCounter
     - HandheldGPSBasic
     - HandHeldMassScannerBorg
-    - HandheldStationMapUnpowered
+#    - HandheldStationMapUnpowered
+    - HandheldCrewMonitorBorg # Mono
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: gps-module }
 
-- type: entity
-  id: BorgModuleRadiationDetection
-  parent: [ BaseBorgModule, BaseProviderBorgModule ]
-  name: radiation detection cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: generic
-    - state: icon-radiation
-  - type: ItemBorgModule
-    moduleId: RadiationDetection # Frontier
-    items:
-    - GeigerCounter
-  - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: geiger-module }
+#- type: entity
+#  id: BorgModuleRadiationDetection
+#  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+#  name: radiation detection cyborg module
+#  description: Provides a geiger functionality to a cyborg chassis.
+#  components:
+#  - type: Sprite
+#    layers:
+#    - state: generic
+#    - state: icon-radiation
+#  - type: ItemBorgModule
+#    moduleId: RadiationDetection # Frontier
+#    items:
+#    - GeigerCounter
+#  - type: BorgModuleIcon
+#    icon: { sprite: Interface/Actions/actions_borg.rsi, state: geiger-module }
 
 - type: entity
   id: BorgModuleTool
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: tool cyborg module
+  description: Includes varied basic tools for a cyborg.
   components:
   - type: Sprite
     layers:
@@ -195,10 +204,11 @@
   - type: ItemBorgModule
     moduleId: Tools # Frontier
     items:
-    - Crowbar
-    - Wrench
-    - Screwdriver
-    - Wirecutter
+    - OmnitoolBorg # Mono
+#    - Crowbar
+#    - Wrench
+#    - Screwdriver
+#    - Wirecutter
     - Multitool
     - WelderIndustrial # Frontier
     - MaintenanceJack # Frontier
@@ -210,6 +220,7 @@
   id: BorgModuleSecurity
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: security cyborg module
+  description: A module enabling mostly non-lethal methods of apprehension for a cyborg to utilize.
   components:
   - type: Sprite
     layers:
@@ -218,7 +229,7 @@
   - type: ItemBorgModule
     moduleId: Security
     items:
-    - Machete
+#    - Machete
     - CyborgStunbaton
     - WeaponCyborgEnergyGun
   - type: BorgModuleIcon
@@ -228,24 +239,24 @@
   id: BorgModuleMercenary
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: mercenary cyborg module
+  description: A lethal module equipped with tools for a cyborg to utilize in dangerous scenarios.
   components:
   - type: Sprite
-    layers:
-    - state: syndicate
-    - state: icon-syndicate
+    sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi # Mono
   - type: ItemBorgModule
     moduleId: Mercenary
     items:
     - Machete
     - WeaponPistolMercenaryEchis
   - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module }
+    icon: { sprite: _Mono/Interface/Action/actions_borg.rsi, state: mercenary-weapon-module } # Mono
 
 # cargo modules
 - type: entity
   id: BorgModuleAppraisal
   parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
   name: cargo cyborg module # Mono
+  description: Contains useful equipment for a cyborg to assist in bulk logistics.
   components:
   - type: Sprite
     layers:
@@ -264,6 +275,7 @@
   id: BorgModuleMining
   parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
   name: mining cyborg module
+  description: Allows a cyborg to assist in operations that involve industrial machinery.
   components:
   - type: Sprite
     layers:
@@ -276,8 +288,8 @@
     - Shovel
     - MineralScannerUnpowered
     # - OreBag # Frontier
-    - Crowbar
-    - Wrench
+ #   - Crowbar
+ #   - Wrench
     - RadioHandheldNF # Frontier: RadioHandheld<RadioHandheldNF
   # Frontier: droppable borg items
   - type: DroppableBorgModule
@@ -295,6 +307,7 @@
   id: BorgModuleGrapplingGun
   parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
   name: grappling gun cyborg module
+  description: Includes a grapple gun for a cyborg to use.
   components:
   - type: Sprite
     layers:
@@ -304,7 +317,7 @@
     moduleId: GrapplingGun # Frontier
     items:
     - WeaponGrapplingGun
-    - HandheldGPSBasic
+ #   - HandheldGPSBasic
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: grappling-module }
 
@@ -312,7 +325,8 @@
 - type: entity
   id: BorgModuleAdvancedTool
   parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ]
-  name: advanced tool cyborg module
+  name: engineering cyborg module
+  description: A one-up from a normal tool module. Capable of nearly every task regarding its use.
   components:
   - type: Sprite
     layers:
@@ -321,8 +335,9 @@
   - type: ItemBorgModule
     moduleId: AdvancedTools # Frontier
     items:
-    - JawsOfLife
-    - PowerDrill
+    - OmnitoolBorg # Mono
+ #   - JawsOfLife
+ #   - PowerDrill
     - Multitool
     - WelderExperimental
     - RemoteSignaller
@@ -338,22 +353,23 @@
   id: BorgModuleConstruction
   parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ]
   name: construction cyborg module
+  description: Provides a cyborg a place to withhold materials, electronics, and fuel.
   components:
   - type: Sprite
     layers:
     - state: engineering
     - state: icon-construction
-  - type: ItemBorgModule
-    moduleId: Construction # Frontier
-    items:
-    - SheetSteelLingering0
-    - SheetGlassLingering0
-    - SheetPlasticLingering0
-    - SheetPlasteelLingering0
-    - PartRodMetalLingering0
-    - FloorTileItemSteelLingering0
-    - FloorTileItemDarkLingering0
-    - FloorTileItemWhiteLingering0
+#  - type: ItemBorgModule
+#    moduleId: Construction # Frontier
+#    items:
+#    - SheetSteelLingering0
+#    - SheetGlassLingering0
+#    - SheetPlasticLingering0
+#    - SheetPlasteelLingering0
+#    - PartRodMetalLingering0
+#    - FloorTileItemSteelLingering0
+#    - FloorTileItemDarkLingering0
+#    - FloorTileItemWhiteLingering0
   # Frontier: droppable borg items
   - type: DroppableBorgModule
     moduleId: Construction
@@ -362,20 +378,32 @@
       whitelist:
         components:
         - ConstructionBag
+    - id: FloorTileItemSteel
+      whitelist:
+        components:
+        - Material
+        - FloorTile
+        - ReactorPart
+    - id: SheetSteel10
+      whitelist:
+        components:
+        - Material
+        - FloorTile
+        - ReactorPart
     - id: APCElectronics
       whitelist:
         components:
-          - ComputerBoard
-          - MachineBoard
-          - BaseElectronics
+        - ComputerBoard
+        - MachineBoard
+        - BaseElectronics
     - id: CapacitorStockPart
       whitelist:
         components:
-          - MachinePart
-    - id: Beaker
+        - MachinePart
+    - id: JerryCan
       whitelist:
-        tags:
-        - GlassBeaker
+        components:
+        - ReagentTank
   # End Frontier: droppable borg items
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: construction-module }
@@ -383,7 +411,8 @@
 - type: entity
   id: BorgModuleRCD
   parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ]
-  name: RCD cyborg module
+  name: matter manipulator cyborg module
+  description: Includes an RCD functionality and ship repair tool for a chassis to use.
   components:
   - type: Sprite
     layers:
@@ -398,28 +427,30 @@
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: rcd-module }
 
 # janitorial modules (this gets its own unique things because janis are epic)
-- type: entity
-  id: BorgModuleLightReplacer
-  parent: [ BaseBorgModuleJanitor, BaseProviderBorgModule ]
-  name: light replacer cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: janitor
-    - state: icon-light-replacer
-  - type: ItemBorgModule
-    moduleId: LightReplacer # Frontier
-    items:
-    - LightReplacer
-    - Crowbar
-    - Screwdriver
-  - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: light-replacer-module }
+#- type: entity
+#  id: BorgModuleLightReplacer
+#  parent: [ BaseBorgModuleJanitor, BaseProviderBorgModule ]
+#  name: light replacer cyborg module
+#  description: Includes tools for a cyborg to use in the activity of basic maintenance.
+#  components:
+#  - type: Sprite
+#    layers:
+#    - state: janitor
+#    - state: icon-light-replacer
+#  - type: ItemBorgModule
+#    moduleId: LightReplacer # Frontier
+#    items:
+#    - LightReplacer
+ #   - Crowbar
+ #   - Screwdriver
+ # - type: BorgModuleIcon
+ #   icon: { sprite: Interface/Actions/actions_borg.rsi, state: light-replacer-module }
 
 - type: entity
   id: BorgModuleCleaning
   parent: [ BaseBorgModuleJanitor, BaseProviderBorgModule ]
   name: cleaning cyborg module
+  description: A module implementing various janitorial functions.
   components:
   - type: Sprite
     layers:
@@ -432,6 +463,7 @@
     # - Bucket # Frontier
     - TrashBag
   # Frontier: droppable items
+    - LightReplacer
   - type: DroppableBorgModule
     moduleId: Cleaning
     items:
@@ -447,6 +479,7 @@
   id: BorgModuleAdvancedCleaning
   parent: [ BaseBorgModuleJanitor, BaseProviderBorgModule ]
   name: advanced cleaning cyborg module
+  description: Features an upgrade from the regular cleaning module.
   components:
   - type: Sprite
     layers:
@@ -460,31 +493,34 @@
     - SprayBottleSpaceCleaner
     - Dropper
     - TrashBag
+    - LightReplacer
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-cleaning-module }
 
 # medical modules
-- type: entity
-  id: BorgModuleDiagnosis # todo: reuse when med refractor is finished
-  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: diagnosis cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: medical
-    - state: icon-diagnosis
-  - type: ItemBorgModule
-    moduleId: Diagnosis # Frontier
-    items:
-    - HandheldHealthAnalyzerUnpowered
-    - ClothingNeckStethoscope
-  - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: diagnosis-module }
+#- type: entity
+#  id: BorgModuleDiagnosis # todo: reuse when med refractor is finished
+#  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
+#  name: diagnosis cyborg module
+#  description: A module providing a cyborg with various methods of diagnosis
+#  components:
+#  - type: Sprite
+#    layers:
+#    - state: medical
+#    - state: icon-diagnosis
+#  - type: ItemBorgModule
+#    moduleId: Diagnosis # Frontier
+#    items:
+#    - HandheldHealthAnalyzerUnpowered
+#    - ClothingNeckStethoscope
+#  - type: BorgModuleIcon
+#    icon: { sprite: Interface/Actions/actions_borg.rsi, state: diagnosis-module }
 
 - type: entity
   id: BorgModuleTreatment
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
   name: treatment cyborg module
+  description: A module allowing a cyborg to perform arbitrary treatments and medical services.
   components:
   - type: Sprite
     layers:
@@ -505,7 +541,8 @@
 - type: entity
   id: BorgModuleDefibrillator
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: defibrillator cyborg module
+  name: EMS cyborg module # Mono - defib -> EMS
+  description: Necessary for a cyborg to perform resuscitation and emergency response.
   components:
   - type: Sprite
     layers:
@@ -514,14 +551,32 @@
   - type: ItemBorgModule
     moduleId: Defibrillator # Frontier
     items:
+    - EmergencyMedipenBorg # Mono
     - DefibrillatorOneHandedUnpowered
+  - type: DroppableBorgModule # Mono
+    moduleId: Defibrillator
+    items:
+    - id: RollerBedSpawnFolded
+      whitelist:
+        tags:
+        - FoldedRollerBed
+    - id: BodyBagFolded
+      whitelist:
+        tags:
+        - FoldedBodyBag
+    - id: CombatMedipen
+      whitelist:
+        components:
+        - Hypospray
+        - BlankMediPen
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: defib-module }
 
 - type: entity
   id: BorgModuleAdvancedTreatment
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: advanced treatment cyborg module
+  name: chemistry cyborg module
+  description: Utilizes various tools for a cyborg to perform chemical manipulation and administration.
   components:
   - type: Sprite
     layers:
@@ -557,6 +612,7 @@
   id: BorgModuleArtifact
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: artifact cyborg module
+  description: Includes basic functionality for a cyborg to assist in research related tasks.
   components:
   - type: Sprite
     layers:
@@ -566,34 +622,41 @@
     moduleId: Artifact # Frontier
     items:
     - NodeScanner
-  - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: node-scanner-module }
-
-- type: entity
-  id: BorgModuleAnomaly
-  parent: [ BaseBorgModule, BaseProviderBorgModule ]
-  name: anomaly cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: science
-    - state: icon-anomalies
-  - type: ItemBorgModule
-    moduleId: Anomaly # Frontier
-    items:
     - AnomalyScanner
     - AnomalyLocatorUnpowered
     - AnomalyLocatorWideUnpowered
     - RemoteSignaller
     - Multitool
   - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: anomaly-module }
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: node-scanner-module }
+
+#- type: entity
+#  id: BorgModuleAnomaly
+#  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+#  name: anomaly cyborg module
+#  description: Allows a cyborg to study and manipulate anomalous research studies.
+#  components:
+#  - type: Sprite
+ #   layers:
+#    - state: science
+#    - state: icon-anomalies
+#  - type: ItemBorgModule
+#    moduleId: Anomaly # Frontier           
+#    items:
+#    - AnomalyScanner
+#    - AnomalyLocatorUnpowered
+#    - AnomalyLocatorWideUnpowered
+#    - RemoteSignaller
+#    - Multitool
+#  - type: BorgModuleIcon
+#    icon: { sprite: Interface/Actions/actions_borg.rsi, state: anomaly-module }
 
 # service modules
 - type: entity
   id: BorgModuleService
   parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
   name: service cyborg module
+  description: A multi-function module designed for various service related tasks regarding paperwork.
   components:
   - type: Sprite
     layers:
@@ -607,7 +670,7 @@
     - HandLabeler
     # - Lighter # Frontier
     # - DrinkShaker # Frontier
-    - BorgDropper
+#     - BorgDropper
   # Frontier: droppable items
   - type: DroppableBorgModule
     moduleId: Service
@@ -620,18 +683,19 @@
       whitelist:
         components:
         - NFLighter
-    - id: DrinkShaker
-      whitelist:
-        components:
-        - NFShaker
+#    - id: DrinkShaker
+#      whitelist:
+#        components:
+#        - NFShaker
   # End Frontier
   - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module }
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: paper-module }
 
 - type: entity
   id: BorgModuleMusique
   parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
   name: musique cyborg module
+  description: A module allowing a cyborg to play a sick tune.
   components:
   - type: Sprite
     layers:
@@ -646,10 +710,42 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: musical-module }
 
+- type: entity # Mono
+  id: BorgModuleBartending
+  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+  name: bartending cyborg module
+  description: A module that provides limitless possibilities. If you consider booze your only reality, that is.
+  components:
+  - type: Sprite
+    layers:
+    - state: cargo
+    - state: icon-bartend
+  - type: DroppableBorgModule
+    moduleId: Bartending
+    items:
+    - id: DrinkShaker
+      whitelist:
+        tags:
+        - Bartending
+    - id: DrinkShotGlass
+      whitelist:
+        components:
+        - Bartending
+    moduleId: Bartending
+    items:
+    - DrinkBeerBottleFullRegen
+    - DrinkVodkaBottleFullRegen
+    - DrinkWineBottleFullRegen
+    - DrinkChampagneBottleFullRegen
+    - DrinkSodaWaterBottleFullRegen
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module }
+
 - type: entity
   id: BorgModuleGardening
   parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
   name: gardening cyborg module
+  description: Includes a plethora of hydroponics-related utility for a chassis.
   components:
   - type: Sprite
     layers:
@@ -661,6 +757,8 @@
     - HydroponicsToolMiniHoe
     - HydroponicsToolSpade
     - HydroponicsToolClippers
+    - HydroponicsToolScythe
+    - HydroponicsToolHatchet
     # - Bucket # Frontier
   # Frontier: droppable borg items
   - type: DroppableBorgModule
@@ -670,41 +768,47 @@
       whitelist:
         tags:
         - Bucket
-  # End Frontier
-  - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: gardening-module }
-
-- type: entity
-  id: BorgModuleHarvesting
-  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
-  name: harvesting cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: service
-    - state: icon-harvesting
-  - type: ItemBorgModule
-    moduleId: Harvesting # Frontier
-    items:
-    - HydroponicsToolScythe
-    - HydroponicsToolHatchet
-    # - PlantBag # Frontier
-  # Frontier: droppable borg items
-  - type: DroppableBorgModule
-    moduleId: Harvesting
-    items:
-    - id: PlantBag
+    - id: PlantBag # Mono
       whitelist:
         components:
         - NFPlantBag
   # End Frontier
   - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: harvesting-module }
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: gardening-module }
+
+#- type: entity
+#  id: BorgModuleHarvesting
+#  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+#  name: harvesting cyborg module
+#  description: Allows a cyborg to store flora.
+#  components:
+#  - type: Sprite
+#    layers:
+#    - state: service
+#    - state: icon-harvesting
+#  - type: ItemBorgModule
+#    moduleId: Harvesting # Frontier
+ #   items:
+ #   - HydroponicsToolScythe
+#    - HydroponicsToolHatchet            # what psycho made TWO gardening modules
+#    # - PlantBag # Frontier
+#  # Frontier: droppable borg items
+#  - type: DroppableBorgModule
+#    moduleId: Harvesting
+#    items:
+#    - id: PlantBag
+#      whitelist:
+#        components:
+#        - NFPlantBag
+  # End Frontier
+ # - type: BorgModuleIcon
+#    icon: { sprite: Interface/Actions/actions_borg.rsi, state: harvesting-module }
 
 - type: entity
   id: BorgModuleClowning
   parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
   name: clowning cyborg module
+  description: Honk!
   components:
   - type: Sprite
     layers:
@@ -724,6 +828,7 @@
   id: BorgModuleSyndicateWeapon
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: weapon cyborg module
+  description: A cyborg module from the remnants of an old era. Provides an Echis and an E-dagger. 
   components:
   - type: Sprite
     layers:
@@ -741,7 +846,7 @@
   id: BorgModuleOperative
   parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
   name: operative cyborg module
-  description: A module that comes with a crowbar, an Emag, an Access Breaker and a syndicate pinpointer.
+  description: A prewar module that comes with an Emag and access breaker.
   components:
     - type: Sprite
       layers:
@@ -750,11 +855,11 @@
     - type: ItemBorgModule
       moduleId: Operative # Frontier
       items:
-      - Crowbar
+#      - Crowbar
       - Emag
       - AccessBreaker
-      - WeaponGrapplingGun # Mono
-      - PinpointerSyndicateNuclear
+#      - WeaponGrapplingGun # Mono
+#      - PinpointerSyndicateNuclear
     - type: BorgModuleIcon
       icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-operative-module }
 
@@ -762,7 +867,7 @@
   id: BorgModuleEsword
   parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
   name: energy sword cyborg module
-  description: A module that comes with a double energy sword.
+  description: A module that comes with a double energy sword. The fabrication date is half a century old.
   components:
     - type: Sprite
       layers:
@@ -772,7 +877,7 @@
       moduleId: EnergySword # Frontier
       items:
       - CyborgEnergySwordDouble
-      - PinpointerSyndicateNuclear
+#      - PinpointerSyndicateNuclear
     - type: BorgModuleIcon
       icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-esword-module }
 
@@ -790,7 +895,7 @@
       moduleId: L6CROW # Frontier
       items:
         - WeaponLightMachineGunL6C
-        - PinpointerSyndicateNuclear
+ #       - PinpointerSyndicateNuclear
     - type: BorgModuleIcon
       icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-l6c-module }
 
@@ -817,6 +922,7 @@
   id: BorgModuleSurgery
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
   name: surgery cyborg module
+  description: A necessary utility for any cyborg looking to perform alternative medical treatments.
   components:
   - type: Sprite
     layers:
@@ -825,51 +931,44 @@
   - type: ItemBorgModule
     moduleId: Surgery
     items:
-    - Scalpel
-    - Drill
-    - Hemostat
-    - Retractor
-    - Cautery
-    - SawElectric
-    - BoneGel
-    # Frontier -> GoobStation -> Monolith: droppable borg items
-  - type: DroppableBorgModule
-    moduleId: Surgery
-    items:
-    - id: OrganHumanBrain
-      whitelist:
-        components:
-        - Organ
-        - BodyPart
-    # End Frontier -> GoobStation -> Monolith: droppable borg items
+    - OmnimedToolBorg # Mono
+    - HandheldHealthAnalyzerUnpowered # Mono
+#    - Scalpel
+#    - Drill
+#    - Hemostat
+#    - Retractor
+#    - Cautery
+#    - SawElectric
+#    - BoneGel
+# Mono - Replaced Droppable with entirely new module
+# Frontier -> GoobStation -> Monolith: droppable borg items
+#  - type: DroppableBorgModule
+#    moduleId: Surgery
+#    items:
+#    - id: OrganHumanBrain
+#      whitelist:
+#        components:
+#        - Organ
+#        - BodyPart
+# End Frontier -> GoobStation -> Monolith: droppable borg items
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: surgery-module }
 
-- type: entity
-  id: BorgModuleAdvancedSurgery
+- type: entity # Mono
+  id: BorgModuleSurgeryKhorpeks
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: advanced surgery cyborg module
+  name: khorpeks surgery cyborg module
+  description: Equips a cyborg with nano-surgeon skills more capable than any modern hospitals throughout the galaxy. Product related injuries are not eligible for reconciliation.
   components:
   - type: Sprite
+    sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi
     layers:
-    - state: medical
-    - state: icon-advanced-surgery
+    - state: mercenary
+    - state: icon-khorpeks-surgery
   - type: ItemBorgModule
     moduleId: AdvancedSurgery
     items:
-    - EnergyScalpel
-    - EnergyCautery
-    - AdvancedRetractor
-    - BoneGel
-    # Frontier -> GoobStation -> Monolith: droppable borg items
-  - type: DroppableBorgModule
-    moduleId: Surgery
-    items:
-    - id: OrganHumanBrain
-      whitelist:
-        components:
-        - Organ
-        - BodyPart
-    # End Frontier -> GoobStation -> Monolith: droppable borg items
+    - OmnimedToolBorgKhorpeks
+    - HandheldHealthAnalyzerUnpowered
   - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-surgery-module }
+    icon: { sprite: _Mono/Interface/Action/actions_borg.rsi, state: khorpeks-surgery-module }
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
index 76b55a8dbaa..f50eb18d971 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -77,6 +77,9 @@
   id: RollerBedSpawnFolded
   suffix: folded
   components:
+  - type: Tag
+    tags:
+    - FoldedRollerBed # Mono tag
   - type: Foldable
     folded: true
   - type: Strap
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index f1c65a49481..20b382cbd7f 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -16,7 +16,7 @@
   - BorgModuleFireExtinguisher
   - BorgModuleRadiationDetection
   - BorgModuleTool
-  - BorgModuleSurgery # Shitmed Change
+  - BorgModuleSurgeryT1 # Shitmed Change
 
 - type: latheRecipePack
   id: BorgModulesDynamic
@@ -60,7 +60,7 @@
   recipes:
   - BorgModuleAdvancedCleaning
   - BorgModuleAdvancedTool
-  - BorgModuleGPS
+  - BorgModuleSurveillance
   - BorgModuleArtifact
   - BorgModuleAnomaly
   - BorgModuleGardening
diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index d8a0fc8715f..3c824ec7599 100644
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -134,8 +134,8 @@
 
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
-  id: BorgModuleGPS
-  result: BorgModuleGPS
+  id: BorgModuleSurveillance
+  result: BorgModuleSurveillance
 
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
@@ -205,8 +205,8 @@
 # Shitmed Recipes
 
 - type: latheRecipe
-  id: BorgModuleSurgery
-  result: BorgModuleSurgery
+  id: BorgModuleSurgeryT1
+  result: BorgModuleSurgeryT1
   completetime: 3
   materials:
     Steel: 250
@@ -277,7 +277,7 @@
     Plastic: 500
     Gold: 300
     Silver: 300
-    
+
 - type: latheRecipe
   id: DexLeftHand
   result: DexLeftHand
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 770f52dbf25..fb75efe0c9a 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -39,7 +39,7 @@
   recipeUnlocks:
   - RadarConsoleCircuitboard
   - HandHeldMassScanner
-  - BorgModuleGPS
+  - BorgModuleSurveillance
   technologyPrerequisites:
   - BasicParts
   position: -2, 0
diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml
index 5717f24c259..ebe957ec89c 100644
--- a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml
@@ -272,7 +272,7 @@
       - BorgModuleConstruction
       - BorgModuleCable
       - BorgModuleRedactedRCD
-      - BorgModuleGPS
+      - BorgModuleSurveillance
   - type: ItemSlots
     slots:
       cell_slot:
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 721a6aeb275..54dc9668587 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -61,4 +61,74 @@
   - type: Tag
     tags:
     - Beer
-    - DrinkBottle
\ No newline at end of file
+    - DrinkBottle
+
+- type: entity
+  parent: DrinkBeerBottleFull
+  id: DrinkBeerBottleFullRegen
+  name: bottomless beer bottle
+  description: An alcoholic beverage made from malted grains, hops, yeast, and water. Be it bluespace or magic; this one refills.
+  suffix: Regen
+  components:
+  - type: SolutionRegeneration
+    solution: drink
+    generated:
+      reagents:
+        - ReagentId: Beer
+          Quantity: 5
+
+- type: entity
+  parent: DrinkVodkaBottleFull
+  id: DrinkVodkaBottleFullRegen
+  name: bottomless vodka bottle
+  description: Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. It seems the motherland has provided you with a bottomless blessing.
+  suffix: Regen
+  components:
+  - type: SolutionRegeneration
+    solution: drink
+    generated:
+      reagents:
+        - ReagentId: Vodka
+          Quantity: 5
+
+- type: entity
+  parent: DrinkWineBottleFull
+  id: DrinkWineBottleFullRegen
+  name: bottomless Doublebearded Bearded Special wine bottle
+  description: An uncontrollable aura of unease and asspainery surrounds the bottle.
+  suffix: Regen
+  components:
+  - type: SolutionRegeneration
+    solution: drink
+    generated:
+      reagents:
+        - ReagentId: Wine
+          Quantity: 5
+
+- type: entity
+  parent: DrinkSodaWaterBottleFull
+  id: DrinkSodaWaterBottleFullRegen
+  name: bottomless soda water bottle
+  description: Like water, but angry! Furious! UNCONTROLLABLE HATRED!
+  suffix: Regen
+  components:
+  - type: SolutionRegeneration
+    solution: drink
+    generated:
+      reagents:
+        - ReagentId: SodaWater
+          Quantity: 5
+
+- type: entity
+  parent: DrinkChampagneBottleFull
+  id: DrinkChampagneBottleFullRegen
+  name: bottomless champagne bottle
+  description: Only people devoid of imagination can't find an excuse for champagne. Drink until you cant think straight!
+  suffix: Regen
+  components:
+  - type: SolutionRegeneration
+    solution: drink
+    generated:
+      reagents:
+        - ReagentId: Champagne
+          Quantity: 5
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Medical/hypospray.yml
new file mode 100644
index 00000000000..ddb74a0afee
--- /dev/null
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Medical/hypospray.yml
@@ -0,0 +1,28 @@
+- type: entity
+  name: auto-fed emergency medipen
+  description: A chemical injector used for administering rapid doses of stabilizing stimulants. Useful for response to critical injuries. This one is automatically fed chemicals by its cyborg's chassis.
+  parent: EmergencyMedipen
+  id: EmergencyMedipenBorg
+  suffix: Borg
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: medipen
+  - type: UseDelay
+    delay: 60
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 15
+    onlyAffectsMobs: true
+    injectOnly: true
+    preventCombatInjection: true # Frontier
+    doAfterTime: 0 # Mono
+  - type: SolutionRegeneration
+    solution: pen
+    generated:
+      reagents:
+        - ReagentId: Epinephrine
+          Quantity: 12
+        - ReagentId: TranexamicAcid
+          Quantity: 3
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Medical/surgery.yml
new file mode 100644
index 00000000000..b6f918ccf9f
--- /dev/null
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Medical/surgery.yml
@@ -0,0 +1,58 @@
+- type: entity
+  name: chassis-mounted surgical multitool
+  description: A medical multitool for a cyborg chassis to use.
+  id: OmnimedToolBorg
+  parent: OmnimedTool
+  components:
+  - type: Hemostat
+    speed: 1.25
+  - type: Scalpel
+    speed: 1.25
+  - type: Drill
+    speed: 1.25
+  - type: BoneSetter
+    speed: 1.25
+  - type: Retractor
+    speed: 1.25
+  - type: Cautery
+    speed: 1.25
+  - type: BoneGel
+    speed: 1.25
+  - type: BoneSaw
+    speed: 1.25
+  - type: Tweezers
+    speed: 1.25
+  - type: Tending
+    speed: 1.25
+
+- type: entity
+  name: khorpeks surgical multitool
+  description: The fastest and most precise surgical equipment money can buy. Using advanced guidance systems, laser-edged serration, painless cautery, this device scrapes the boundaries between seamless manipulation of the physical body.
+  id: OmnimedToolBorgKhorpeks
+  parent: OmnimedTool
+  components:
+  - type: Hemostat
+    speed: 3
+  - type: Scalpel
+    speed: 3
+  - type: Drill
+    speed: 3
+  - type: BoneSetter
+    speed: 3
+  - type: Retractor
+    speed: 3
+  - type: Cautery
+    speed: 3
+  - type: BoneGel
+    speed: 3
+  - type: BoneSaw
+    speed: 3
+  - type: Tweezers
+    speed: 3
+  - type: Tending
+    speed: 3
+  - type: Sprite
+    state: evil
+  - type: Item
+    size: Small
+    heldPrefix: evil
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Robotics/borg_modules.yml
index b52d0b6d26c..51bce6867c2 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1,9 +1,53 @@
+# Medical Modules
+
+- type: entity
+  id: BorgModuleColdStorage
+  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
+  name: cold storage cyborg module
+  description: Provides a cyborg with a sterile place to store organs and body parts.
+  components:
+  - type: Sprite
+    layers:
+    - state: medical
+    - state: icon-treatment
+  - type: DroppableBorgModule
+    moduleId: ColdStorage
+    items:
+    - id: OrganHumanBrain
+      whitelist:
+        components:
+        - Organ
+        - BodyPart
+    - id: OrganHumanHeart
+      whitelist:
+        components:
+        - Organ
+        - BodyPart
+    - id: OrganHumanLungs
+      whitelist:
+        components:
+        - Organ
+        - BodyPart
+    - id: OrganHumanLiver
+      whitelist:
+        components:
+        - Organ
+        - BodyPart
+    - id: OrganHumanKidneys
+      whitelist:
+        components:
+        - Organ
+        - BodyPart
+  - type: BorgModuleIcon
+    icon: { sprite: _Mono/Interface/Action/actions_borg.rsi, state: cold-storage-module }
+
 # Mercenary Modules
 
 - type: entity
   id: BorgModuleAdvancedWeapon
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: advanced weapon cyborg module
+  description: A weapons utility for a cyborg chassis. Includes an Anaconda and e-sword.
   components:
   - type: Sprite
     sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi
@@ -24,6 +68,7 @@
   id: BorgModuleTSFStandardWeapon
   parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseFactionGearTSFT2 ]
   name: TSFMC weapon cyborg module
+  description: A rather basic weapons module. utilizes an e-revolver and an e-sword.
   components:
   - type: Sprite
     sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi
@@ -42,6 +87,7 @@
   id: BorgModuleTSFStandardAssault
   parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseFactionGearTSFT2 ]
   name: TSFMC basic assault cyborg module
+  description: Includes an e-sword and an Ullman pulse pistol.
   components:
   - type: Sprite
     sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi
@@ -60,6 +106,7 @@
   id: BorgModuleTSFAdvancedWeapon
   parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseFactionGearTSFT3 ]
   name: TSFMC advanced weapon cyborg module
+  description: This module seems to provide a chassis with an HF blade and a pulse rifle.
   components:
   - type: Sprite
     sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi
@@ -80,6 +127,7 @@
   id: BorgModulePDVStandardWeapon
   parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseFactionGearPDVT2 ]
   name: PDV weapon cyborg module
+  description: A weapons module including an Anaconda. Comes with a machete if the first weapon didn't work.
   components:
   - type: Sprite
     sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi
@@ -98,6 +146,7 @@
   id: BorgModulePDVStandardAssault
   parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseFactionGearPDVT2 ]
   name: PDV basic assault cyborg module
+  description: An extremely heavy-duty module. Comes with a machete to compliment its minigun. Best not stand in front the provided chassis.
   components:
   - type: Sprite
     sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi
@@ -116,6 +165,7 @@
   id: BorgModulePDVAdvancedWeapon
   parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseFactionGearPDVT3 ]
   name: PDV advanced weapon cyborg module
+  description: A module allowing a cyborg to enter combat with a VT7 blade and an L6.
   components:
   - type: Sprite
     sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi
@@ -136,6 +186,7 @@
   id: BorgModuleRedactedRCD
   parent: [ BaseBorgModule, BaseProviderBorgModule, BaseFactionGearOtherFactionT3 ]
   name: pre-fracture RCD module
+  description: An extremely sleek and strangely advanced looking module. It seems to provide some sort of construction-related functionality.
   components:
   - type: Sprite
     layers:
@@ -155,6 +206,7 @@
   id: BorgModuleRedactedWeapon
   parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: pre-fracture weapon cyborg module
+  description: It looks unfamiliar... It seems to provide a cyborg with some kind of upgrade.
   components:
   - type: Sprite
     sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Tools/repair.yml b/Resources/Prototypes/_Mono/Entities/Objects/Tools/repair.yml
index eda4ba9dcae..6a9f5ebcdbe 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Tools/repair.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Tools/repair.yml
@@ -57,7 +57,7 @@
     maxCharges: 300
     charges: 50
   - type: AutoRecharge
-    rechargeDuration: 5
+    rechargeDuration: 2.5 # 12 Charge every 30s
 
 - type: entity
   id: ShipRepairDeviceAdmin
@@ -86,7 +86,7 @@
     maxCharges: 800
     charges: 50
   - type: AutoRecharge
-    rechargeDuration: 2
+    rechargeDuration: 0.5 # 30 charge every 15s
   - type: Tag
     tags:
     - ShipRepairTool
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/_Mono/Entities/Objects/Tools/tools.yml
new file mode 100644
index 00000000000..8d4fd0e8e4d
--- /dev/null
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Tools/tools.yml
@@ -0,0 +1,13 @@
+- type: entity
+  name: omnitool
+  parent: Omnitool
+  id: OmnitoolBorg
+  description: A device designed to fit the body of a cyborg. It is capable of various engineering tasks.
+  suffix: borg
+  components:
+  - type: UseDelay
+    delay: 0.5
+  - type: Tool
+    qualities:
+    - Screwing
+    speedModifier: 1.6
diff --git a/Resources/Prototypes/_Mono/borg_types.yml b/Resources/Prototypes/_Mono/borg_types.yml
index 9452df773b0..f8b0afb15e6 100644
--- a/Resources/Prototypes/_Mono/borg_types.yml
+++ b/Resources/Prototypes/_Mono/borg_types.yml
@@ -12,7 +12,7 @@
   - BorgModulePDVStandardWeapon
   - BorgModuleJetpack
   - BorgModuleTool
-  - BorgModuleGPS
+  - BorgModuleSurveillance
   inventoryTemplateId: borgShort
   spriteBodyState: assault
   spriteHasMindState: assault_l
@@ -33,7 +33,7 @@
   defaultModules:
   - BorgModulePDVStandardWeapon
   - BorgModuleJetpack
-  - BorgModuleGPS
+  - BorgModuleSurveillance
   - BorgModuleTool
   - BorgModuleConstruction
   - BorgModuleRCD
@@ -63,10 +63,10 @@
   defaultModules:
   - BorgModulePDVStandardWeapon
   - BorgModuleJetpack
-  - BorgModuleGPS
+  - BorgModuleSurveillance
   - BorgModuleTool
   - BorgModuleTreatment
-  - BorgModuleSurgery
+  - BorgModuleSurgeryT1
   - BorgModuleDefibrillator
   addComponents:
   - type: ShowHealthBars
@@ -94,7 +94,7 @@
   - BorgModuleTSFStandardWeapon
   - BorgModuleJetpack
   - BorgModuleTool
-  - BorgModuleGPS
+  - BorgModuleSurveillance
   inventoryTemplateId: borgShort
   spriteBodyState: assault
   spriteHasMindState: assault_l
@@ -115,7 +115,7 @@
   defaultModules:
   - BorgModuleTSFStandardWeapon
   - BorgModuleJetpack
-  - BorgModuleGPS
+  - BorgModuleSurveillance
   - BorgModuleTool
   - BorgModuleConstruction
   - BorgModuleRCD
@@ -145,10 +145,10 @@
   defaultModules:
   - BorgModuleTSFStandardWeapon
   - BorgModuleJetpack
-  - BorgModuleGPS
+  - BorgModuleSurveillance
   - BorgModuleTool
   - BorgModuleTreatment
-  - BorgModuleSurgery
+  - BorgModuleSurgeryT1
   - BorgModuleDefibrillator
   addComponents:
   - type: ShowHealthBars
@@ -162,4 +162,4 @@
   spriteNoMindState: medical_l
   spriteToggleLightState: medical_l
   petSuccessString: petting-success-engineer-cyborg
-  petFailureString: petting-failure-engineer-cyborg
\ No newline at end of file
+  petFailureString: petting-failure-engineer-cyborg
diff --git a/Resources/Prototypes/_Mono/tags.yml b/Resources/Prototypes/_Mono/tags.yml
index 5f4ba57f1dc..195f0ebeb6d 100644
--- a/Resources/Prototypes/_Mono/tags.yml
+++ b/Resources/Prototypes/_Mono/tags.yml
@@ -674,3 +674,14 @@
 
 - type: Tag
   id: WhitelistChameleonIdViperSpec
+
+# Various tags for cyborg pseudo hands
+
+- type: Tag
+  id: FoldedRollerBed
+
+- type: Tag
+  id: FoldedBodyBag
+
+- type: Tag
+  id: Bartending
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
index 928c1ea1753..9b9ba01fbbb 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
@@ -133,7 +133,7 @@
     canChangeTransferAmount: true
   - type: SolutionItemStatus
     solution: tank
-  - type: ReagentTank #Mono: Enable borg tool draw
+  - type: ReagentTank    #Mono Enable borg tool draw
     tankType: Fuel
   - type: UserInterface
     interfaces:
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index d08fc3346df..56a9cc77591 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -13,6 +13,7 @@
 
   defaultModules:
   - BorgModuleTool
+  - BorgModuleSurveillance # Mono
 
   radioChannels:
   - Science
@@ -48,6 +49,7 @@
   - BorgModuleConstruction
   - BorgModuleRCD
   - BorgModuleCable
+  - BorgModuleSurveillance # Mono
 
   radioChannels:
   - Engineering
@@ -91,6 +93,7 @@
   - BorgModuleGrapplingGun
   - BorgModuleMining
   - BorgModuleAppraisal
+  - BorgModuleSurveillance # Mono
 
   radioChannels:
   - Supply
@@ -127,6 +130,7 @@
   - BorgModuleTool # Mono
   - BorgModuleLightReplacer
   - BorgModuleCleaning
+  - BorgModuleSurveillance # Mono
 
   radioChannels:
   - Science
@@ -164,6 +168,8 @@
   - BorgModuleTreatment
   - BorgModuleSurgery # Mono
   - BorgModuleDefibrillator # Mono
+  - BorgModuleSurveillance # Mono
+  - BorgModuleColdStorage # Mono
 
   radioChannels:
   - Science
@@ -214,6 +220,8 @@
   - BorgModuleMusique
   - BorgModuleService
   - BorgModuleClowning
+  - BorgModuleSurveillance # Mono
+  - BorgModuleBartending # Mono
 
   radioChannels:
   - Science
diff --git a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
index c1507ca5396..f2df3965bff 100644
--- a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
@@ -42,7 +42,7 @@
   [color=#a4885c]Generic[/color] modules add versatility. They can be fitted into any chassis, granting useful tools such as crowbars, GPS, and the ability to interact with cables. [bold]The generic cyborg chassis can fit up to five additional modules.[/bold]
   <Box>
     <GuideEntityEmbed Entity="BorgModuleCable" Caption="Cable"/>
-    <GuideEntityEmbed Entity="BorgModuleGPS" Caption="GPS"/>
+    <GuideEntityEmbed Entity="BorgModuleSurveillance" Caption="GPS"/>
     <GuideEntityEmbed Entity="BorgModuleFireExtinguisher" Caption="Fire Extinguisher"/>
   </Box>
   <Box>
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index 0170e11812f..2247c45830e 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9. paper-module by @thoughtlessuser (Discord).",
     "size": {
         "x": 32,
         "y": 32
@@ -111,6 +111,9 @@
         },
         {
             "name": "select-type"
+        },
+        {
+            "name": "paper-module"
         }
     ]
 }
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/paper-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/paper-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..97b425a3509bbe98554e397c3724c675424bf634
GIT binary patch
literal 711
zcmV;&0yzDNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007xNkl<ZScUDE
zKS&!<9LGNmNg!>KDMB-7Q;SQ<pgE(PL+KVmLAqor9Riks;LxE%rw*l4X&@Bp&@oF9
zinuxirM7w|NC+t|nxRQi1Y=AQtLbo;>;3VP%QZ@&{lbI0-|zk2`~JS~{ocESe;wD<
zFM=Snu3}PA6qR|EhxX*6C|>I1f*@!}ICadxAG}loq9`gP3<Lo11^`H9rvS(#a*C^M
z)7$m_w(r9J^{OVuNT9I~z)oR@rRSR(SKAhQ5mEZ7k%=#8e3|$HfN6gKhr!|vkXoE3
zG#VncI4vn6x6o(^yaAS8RSZ6TA9d68H-o$hTlj-Yi@k|y-uq&Qmb%(Z_W&SgQ_;9n
z*(qr~b=h>XOXJGp==Ol746mXJs8<mL;o>p`I<Hfo2&iFN1-)Qs&O_z(4_kcxSb?#u
zljuN{^?U2&6F<8L^izSMIS+Sg5e{kx<dZeaah(ZRRG^(Xz`OgONSB^5J2BrqupbJj
zGynMHGY{WRGJE%>CE|MYtU&rpl48Bc>G3J=A8e4`dMagZb?<ajU~JiK8vEG$h}^1l
zseDMT0@%*nl)%Z+#pN^;oFQM$;~Vy|>)K_!Gzh@PM33dyO##=w%McR@M3l_8{o4}J
z!xI3;mTv%%pZL}r5i<gg>&6Sx?RMiE_EBgSaL5;^2aiNVR&2a9Xibf73Y<634KZuY
zHPi82O&5;aPR<%<woXw?3UoqrAj+n<K(pGgRta_#&|{=NA}xt;i`@4d>_ItxXq|N@
z0+Y8UEd{O|ufP$M6Y{3**Ex{e%Mq@HDc&q<?BQA%K(X7+SPuh%a>7NKuYk53B^$r(
tcE1}sDIkBT*c;d))c*wV7yO$2$1e|Q9BK(ZvlajV002ovPDHLkV1lWPO4a}X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-bartend.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-bartend.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c3333eee25469af8bfbfc5884f9ac43b4f81131
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZci7-kcigg1PRu~2_ijBfd*V`
z5(bl29aQuEZQmn%Vb#eE3x8R~ygRXGwaV<{F00s5PD@HiNX%Ki<b-LH5&Mstwdnyp
zzfTFAykKs?mjDDiK0ab~ofiD0LHABC&;D!O20G~)i%u}=EXlgiRP`&&Na<sy<4ff)
p1qTj?-#@V-4PvF+L5%~v3??h3rmiTk`UrFugQu&X%Q~loCIBZ0OV<DZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 644a78b47d8..70d8a272edd 100644
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).",
+  "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). icon-bartend by @thoughtlessuer (Discord).",
   "size": {
     "x": 32,
     "y": 32
@@ -132,6 +132,9 @@
     },
     {
       "name": "syndicate"
+    },
+    {
+      "name": "icon-bartend"
     }
   ]
 }
diff --git a/Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/cold-storage-module.png b/Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/cold-storage-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc05202cc6b0e8ceb971095ff1b21b4fba8fa46e
GIT binary patch
literal 607
zcmV-l0-*hgP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006eNkl<ZScUCZ
zF>BjE6#is7bWlB=pb<^LLj=ht4hp6}z~H@0OQsCoy!AJ9&z9`gPbl;U2!TL&OF<b5
z4yc9m6ld^Yqz=lx+?^y_2~kOD9z67P_nzLnPrC1&fd5@A^@ej^{EehZl2BeUWb!0Q
zI!(?w*NS*$R0j0-IxQec5-Orn006*dofd$bU)pW8fZJua1sL-0BGBu<MSk<UVn0-N
zB4E9KgJQj+tCT$7z+!{aUaz#crWgPZN1(V}mMdKT)W)6TBZ$i%6?<DuowPzAU$5Z$
zKC-K8I0p{ILO?78`AS>Pxrh76uC8IR!P6iB0NH#AZ!|{w{Tt1BqcH%`n7Gt^iWc8f
z>s{a+I7q{|Oc2Hxe*T1L761T-lPRKE0Pn+lq+wjXl7*<xXds|baa$%dk!TugDu8oN
zRNSjL*o@R-1Hfi*eV@jLlPS_L25g3tivTAV0bsKdmC2O+WQ=?UX_MSFqXPXsO?&Tr
zvb~R|WDmc5t+iDjHI@`8)ULY|fjr;PYSdLmvw#qYW<doV*Z1$aVhaM#`x{WzIX(hx
zcE1ah_bpfMjmDa9ts2t07nplIIzJ;Gh|bRdlzh+{iN*pNdVzbmU)ken7;7<-D<o?^
zX)nm;a{wh0Kz%QebJ@IuUSRUNSP1HdYG2qE1K{z!z~psxh30vnDW*;yeIm;94f(3}
tPI);KZbRUXp*qd4{u2Pt;MeR${s1~acM5y7J<<RG002ovPDHLkV1kO15f%Ud

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/khorpeks-surgery-module.png b/Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/khorpeks-surgery-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..95e8d3f2b12e0c5a9524c67e0eb6ab5fb9d32b46
GIT binary patch
literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800089Nkl<ZScUDE
z&r1|x7{@<5<0^<bNJcFlG<Un$lHkB1Tf2fm2iZ<~?&QU55OnC!A&?BcM%bTF5hMr^
zLgmiEn84T!@i!qZB#0IZx;ooocHZ3?$8}tHEvWBl=KV3x^Zh)}yE_B_x_reqs;cJB
zBB-wGBCfcwg6q0o)!?eC+LEYoWCo3aswSZ8x=7+s0su5LS2Y24Hf*<t6Zo}R)^jC)
zt+)<G5=edBEIfRGk=-k~uOb8_Stc01ZX3(pj>1S2930peSCW9`Iv7c?G&5nJR3|X9
zdt%K|B+4Qn$+8(Z?|Lbf#Hec&^H)0KNPXSR504PiUgLYCF+V(FPM(H9v15SMIgPfC
zC}g%E?=~1o;Cp%(V`vO%cZb~27&$=N-EpPhnLu%!*Vb16XzPdy_fmafJ~uSRQYvYd
zCY1y*3Dup3K;Hf8oK^@vQ>e2=1+e!+W~<~$@ZJOYy89IKhpORx0P35NFneKbeTCMR
z%LO9&_0&5~!f6Ryy%r_)@ufMI*&-N8h+bGoz5)<LEJCH^nSg=W?VUXX_>=(3g^<8*
z^@5~aJbW_h91kj&fOP_tgI1z9Lu|BXX(7h;k42zxBv<D&!m)mFGLDlc0+K8fAGmLB
zSl;A&yFx&NZF!NeUo_j=aIBx%_b=St!^sIq{#xR99`my$1i-m;mcX(f$O87B2*>)F
zog6>5?xhnbB49Ze!S!!&$q(r)AErkE=<FFVky~<hy;EKZNd8*lw;qXMTkyAqf4SMo
zaohHjxOY#Wp&3b*>FpY1-!1s`sI9(+bH7{Ni{*(xzT;~$+w7+mSLc<ID**$T`uv>U
zu0fH6(|OtQ+5-kKHT{I%8~3W>{OAOVPJscu`}7Pd;oMTS-U-Xq-}P3ks_L12m{|Jb
cpJxB{8<qPr3RX3!n*aa+07*qoM6N<$f-t{jTmS$7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/meta.json b/Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/meta.json
index 89502bf39b1..43ea4613671 100644
--- a/Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/meta.json
+++ b/Resources/Textures/_Mono/Interface/Action/actions_borg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by Honestly101 (Github) for Monolith.",
+    "copyright": "Created by Honestly101 (Github) for Monolith. Cold storage module and khorpeks surgery module by @thoughtlessuser (discord).",
     "size": {
         "x": 32,
         "y": 32
@@ -21,6 +21,12 @@
         },
         {
             "name":"pdvadvanced-weapon-module"
+        },
+        {
+            "name":"cold-storage-module"
+        },
+        {
+            "name":"khorpeks-surgery-module"
         }
     ]
 }
diff --git a/Resources/Textures/_Mono/Objects/Specific/Robotics/borgmodule.rsi/icon-khorpeks-surgery.png b/Resources/Textures/_Mono/Objects/Specific/Robotics/borgmodule.rsi/icon-khorpeks-surgery.png
new file mode 100644
index 0000000000000000000000000000000000000000..130419a1b3c7858d2b94cae5b2a805442bd53fe0
GIT binary patch
literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002ONkl<ZScUD-
zAqv7!9LMqRe6nPkCoruk2<zL#px7;9btqoIV(<hj9>7Z&ynwKz2iPvKIrBhf7>d~T
zf|ma$K6vl@<AD%D2=Qk|-3zP5p!_~No)Q4!IIjI(qwa-I$}!(@U0MTr^Acxk(I2;%
zY-|8V!;aQ~rcV5FFn}A%G3k$6fXyQ+v<B4vfht}Nc|~>OS_8Z&$2g~4ml?)6rARWo
zC}%gD{$_w52DnP$Dn)nS##-O;!$2!8gb+diJORQ2F$3q9tl9to002ovPDHLkV1n$k
BXte+U

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Mono/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/_Mono/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 86743b67ec4..b4d7486a121 100644
--- a/Resources/Textures/_Mono/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/_Mono/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -5,7 +5,7 @@
   "y": 32 
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by Honestly101 (Github) for Monolith.",
+  "copyright": "Created by Honestly101 (Github) for Monolith. Khorpeks surgery by @thoughtlessuser (Discord)",
   "states": [
     {
       "name": "icon-mercenary"
@@ -24,6 +24,9 @@
     },
     {
       "name": "pdv"
+    },
+    {
+      "name": "icon-khorpeks-surgery"
     }
   ]
 }

From 5b10e2185cf9dd34d516ab1be946c46a4a3a646e Mon Sep 17 00:00:00 2001
From: thoughtlessuser <thoughtlessuser@gmail.com>
Date: Mon, 13 Jul 2026 20:32:00 -0500
Subject: [PATCH 2/9] tweaks

---
 .../Objects/Specific/Robotics/borg_modules.yml     | 13 ++++++++-----
 .../Objects/Consumable/Drinks/drinks_bottles.yml   | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 2d27b12bfc7..a9ca46cdc5b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -340,12 +340,12 @@
  #   - PowerDrill
     - Multitool
     - WelderExperimental
-    - RemoteSignaller
     - GasAnalyzer
-    - GeigerCounter
+    - NaniteApplicatorExperimental # Monolith
+    - RemoteSignaller
+#    - GeigerCounter
     - MaintenanceJack # Frontier
     - RPED
-    - NaniteApplicatorExperimental # Monolith
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-tools-module }
 
@@ -383,7 +383,6 @@
         components:
         - Material
         - FloorTile
-        - ReactorPart
     - id: SheetSteel10
       whitelist:
         components:
@@ -400,10 +399,12 @@
       whitelist:
         components:
         - MachinePart
-    - id: JerryCan
+    - id: JerryCanWeldingFuel
       whitelist:
         components:
         - ReagentTank
+        - AmeFuelContainer
+        - ReactorPart
   # End Frontier: droppable borg items
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: construction-module }
@@ -732,6 +733,7 @@
       whitelist:
         components:
         - Bartending
+  - type: ItemBorgModule
     moduleId: Bartending
     items:
     - DrinkBeerBottleFullRegen
@@ -739,6 +741,7 @@
     - DrinkWineBottleFullRegen
     - DrinkChampagneBottleFullRegen
     - DrinkSodaWaterBottleFullRegen
+    - DrinkWhiskeyBottleFullRegen
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module }
 
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 54dc9668587..0189a660723 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -132,3 +132,17 @@
       reagents:
         - ReagentId: Champagne
           Quantity: 5
+
+- type: entity
+  parent: DrinkWhiskeyBottleFull
+  id: DrinkWhiskeyBottleFullRegen
+  name: bottomless Uncle Git's Special Reserve
+  description: An endless premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES.
+  suffix: Regen
+  components:
+  - type: SolutionRegeneration
+    solution: drink
+    generated:
+      reagents:
+        - ReagentId: Whiskey
+          Quantity: 5

From 9b3aebbd5f394dc118cc4eee8f537813754d56d7 Mon Sep 17 00:00:00 2001
From: thoughtlessuser <thoughtlessuser@gmail.com>
Date: Mon, 13 Jul 2026 20:53:36 -0500
Subject: [PATCH 3/9] linters

---
 .../Spawners/Random/Department/science.yml    |  6 +--
 .../Consumable/Drinks/drinks_special.yml      |  1 -
 .../Objects/Materials/Sheets/metal.yml        |  3 --
 .../Prototypes/Recipes/Lathes/robotics.yml    | 46 +++++++++----------
 Resources/Prototypes/borg_types.yml           |  2 +-
 5 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
index a5f0a1f2737..c450343611d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Department/science.yml
@@ -111,15 +111,15 @@
     - BorgModuleAdvancedCleaning
     - BorgModuleClowning
     - BorgModuleGardening
-    - BorgModuleHarvesting
+#    - BorgModuleHarvesting
     rareChance: 0.1
     prototypes:
     - BorgModuleCable
     - BorgModuleFireExtinguisher
     - BorgModuleSurveillance
-    - BorgModuleRadiationDetection
+ #   - BorgModuleRadiationDetection
     - BorgModuleTool
     - BorgModuleArtifact
-    - BorgModuleAnomaly
+ #   - BorgModuleAnomaly
     chance: 0.9
     offset: 0.2
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index a8f345a30ad..0327fa75ec6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -77,7 +77,6 @@
     inHandsMaxFillLevels: 1
     inHandsFillBaseName: -fill-
   # Mono tag
-  addComponent:
   - type: Tag
     tags:
     - Bartending
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 2c7faa13549..0271a8d0f68 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -112,9 +112,6 @@
   - type: Stack
     lingering: true
     count: 0
-  - type: Tag
-    tags:
-    - SheetsBorg
 
 - type: entity
   parent: SheetMetalBase
diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index 3c824ec7599..c01bb1dcadc 100644
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -137,10 +137,10 @@
   id: BorgModuleSurveillance
   result: BorgModuleSurveillance
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleRadiationDetection
-  result: BorgModuleRadiationDetection
+#- type: latheRecipe
+#  parent: BaseBorgModuleRecipe
+#  id: BorgModuleRadiationDetection
+#  result: BorgModuleRadiationDetection
 
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
@@ -185,10 +185,10 @@
   id: BorgModuleArtifact
   result: BorgModuleArtifact
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleAnomaly
-  result: BorgModuleAnomaly
+#- type: latheRecipe
+#  parent: BaseBorgModuleRecipe
+#  id: BorgModuleAnomaly
+#  result: BorgModuleAnomaly
 
 # Service Modules
 
@@ -197,31 +197,31 @@
   id: BorgModuleGardening
   result: BorgModuleGardening
 
-- type: latheRecipe
-  parent: BaseBorgModuleRecipe
-  id: BorgModuleHarvesting
-  result: BorgModuleHarvesting
+#- type: latheRecipe
+#  parent: BaseBorgModuleRecipe
+#  id: BorgModuleHarvesting
+#  result: BorgModuleHarvesting
 
 # Shitmed Recipes
 
 - type: latheRecipe
-  id: BorgModuleSurgeryT1
-  result: BorgModuleSurgeryT1
+  id: BorgModuleSurgery
+  result: BorgModuleSurgery
   completetime: 3
   materials:
     Steel: 250
     Glass: 250
     Plastic: 250
 
-- type: latheRecipe
-  id: BorgModuleAdvancedSurgery
-  result: BorgModuleAdvancedSurgery
-  completetime: 3
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 250
-    Gold: 50
+#- type: latheRecipe
+#  id: BorgModuleAdvancedSurgery
+#  result: BorgModuleAdvancedSurgery
+#  completetime: 3
+#  materials:
+#    Steel: 500
+#    Glass: 500
+#    Plastic: 250
+#    Gold: 50
 
 - type: latheRecipe
   id: JawsOfLifeLeftArm
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index 56a9cc77591..a2f4a8b927e 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -128,7 +128,7 @@
 
   defaultModules:
   - BorgModuleTool # Mono
-  - BorgModuleLightReplacer
+#  - BorgModuleLightReplacer
   - BorgModuleCleaning
   - BorgModuleSurveillance # Mono
 

From 53b7af1c853c397c7163b2e70c82447940851cb6 Mon Sep 17 00:00:00 2001
From: thoughtlessuser <thoughtlessuser@gmail.com>
Date: Mon, 13 Jul 2026 21:05:10 -0500
Subject: [PATCH 4/9] morelinters

---
 .../Prototypes/Recipes/Lathes/Packs/robotics.yml | 16 ++++++++--------
 .../Prototypes/Research/civilianservices.yml     |  4 ++--
 .../Prototypes/_Mono/Research/experimental.yml   |  2 +-
 Resources/Prototypes/_Mono/borg_types.yml        |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index 20b382cbd7f..19489a0dc37 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -14,14 +14,14 @@
   recipes:
   - BorgModuleCable
   - BorgModuleFireExtinguisher
-  - BorgModuleRadiationDetection
+#  - BorgModuleRadiationDetection
   - BorgModuleTool
-  - BorgModuleSurgeryT1 # Shitmed Change
+#  - BorgModuleSurgery # Shitmed Change
 
-- type: latheRecipePack
-  id: BorgModulesDynamic
-  recipes:
-  - BorgModuleAdvancedSurgery
+#- type: latheRecipePack
+#  id: BorgModulesDynamic
+#  recipes:
+#  - BorgModuleAdvancedSurgery
 
 - type: latheRecipePack
   id: SMCybernetics
@@ -62,9 +62,9 @@
   - BorgModuleAdvancedTool
   - BorgModuleSurveillance
   - BorgModuleArtifact
-  - BorgModuleAnomaly
+ # - BorgModuleAnomaly
   - BorgModuleGardening
-  - BorgModuleHarvesting
+ # - BorgModuleHarvesting
   - BorgModuleDefibrillator
   - BorgModuleAdvancedTreatment
   - BorgModuleJetpack # Frontier
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 2b3a8f3c8e3..a90a89b8a19 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -9,7 +9,7 @@
   cost: 5000
   recipeUnlocks:
   - BorgModuleGardening
-  - BorgModuleHarvesting
+#  - BorgModuleHarvesting
   - PlantBagOfHolding
   - SeedExtractorMachineCircuitboard
   - HydroponicsTrayMachineCircuitboard
@@ -176,7 +176,7 @@
   - EnergyScalpel
   - EnergyCautery
   - AdvancedRetractor
-  - BorgModuleAdvancedSurgery
+#  - BorgModuleAdvancedSurgery
   - DefibrillatorCompact # Mono
   technologyPrerequisites:
   - SuperParts
diff --git a/Resources/Prototypes/_Mono/Research/experimental.yml b/Resources/Prototypes/_Mono/Research/experimental.yml
index e07a2c10453..c769f8ba4c5 100644
--- a/Resources/Prototypes/_Mono/Research/experimental.yml
+++ b/Resources/Prototypes/_Mono/Research/experimental.yml
@@ -36,7 +36,7 @@
   - AnomalyScanner
   - AnomalyLocator
   - AnomalyLocatorWide
-  - BorgModuleAnomaly
+  #- BorgModuleAnomaly
   - APECircuitboard
   - AnomalyVesselCircuitboard
   - NodeScanner
diff --git a/Resources/Prototypes/_Mono/borg_types.yml b/Resources/Prototypes/_Mono/borg_types.yml
index f8b0afb15e6..eed827c2899 100644
--- a/Resources/Prototypes/_Mono/borg_types.yml
+++ b/Resources/Prototypes/_Mono/borg_types.yml
@@ -148,7 +148,7 @@
   - BorgModuleSurveillance
   - BorgModuleTool
   - BorgModuleTreatment
-  - BorgModuleSurgeryT1
+  - BorgModuleSurgery
   - BorgModuleDefibrillator
   addComponents:
   - type: ShowHealthBars

From 8c1bea6df4b93da971c58554d27d8fa6b40032ad Mon Sep 17 00:00:00 2001
From: thoughtlessuser <thoughtlessuser@gmail.com>
Date: Mon, 13 Jul 2026 21:12:15 -0500
Subject: [PATCH 5/9] last2maybe

---
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 +-
 Resources/Prototypes/_Mono/borg_types.yml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 9f52b4a05bc..4d74b07713a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -399,7 +399,7 @@
     - MechParts
     - MechEquipment
     # Shitmed Change
-    - BorgModulesDynamic
+ #   - BorgModulesDynamic
     - SMCybernetics
     # Goob/Mono - modsuits
     - Modsuits
diff --git a/Resources/Prototypes/_Mono/borg_types.yml b/Resources/Prototypes/_Mono/borg_types.yml
index eed827c2899..d2edc8f0542 100644
--- a/Resources/Prototypes/_Mono/borg_types.yml
+++ b/Resources/Prototypes/_Mono/borg_types.yml
@@ -66,7 +66,7 @@
   - BorgModuleSurveillance
   - BorgModuleTool
   - BorgModuleTreatment
-  - BorgModuleSurgeryT1
+  - BorgModuleSurgery
   - BorgModuleDefibrillator
   addComponents:
   - type: ShowHealthBars

From 863ea2e77a616d68bddf0b05579f6d9cda7e7940 Mon Sep 17 00:00:00 2001
From: thoughtlessuser <thoughtlessuser@gmail.com>
Date: Mon, 13 Jul 2026 22:01:04 -0500
Subject: [PATCH 6/9] guidebook

---
 Resources/ServerInfo/Guidebook/Science/Cyborgs.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
index f2df3965bff..4a88c08b309 100644
--- a/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
+++ b/Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
@@ -51,7 +51,6 @@
 
   For more specific needs, [color=#a4885c]specialized[/color] modules are available, granting capabilities like scanning anomalies, constructing walls, reviving crew mates, or cleaning a space lube spill. These modules are typically colored with the same palette as the department [italic](or occupation)[/italic] they relate to. These modules [italic](with exception to [color=#D381C9]science[/color] modules, which can fit any chassis,)[/italic] can only be fitted in their associated borg chassis. [bold]The specialized borg chassis, being the engineering, janitorial, service, medical, and mining chassis, can fit up to three additional modules.[/bold]
   <Box>
-    <GuideEntityEmbed Entity="BorgModuleAnomaly" Caption="Anomaly"/>
     <GuideEntityEmbed Entity="BorgModuleRCD" Caption="RCD"/>
     <GuideEntityEmbed Entity="BorgModuleMining" Caption="Mining"/>
     <GuideEntityEmbed Entity="BorgModuleCleaning" Caption="Cleaning"/>

From 227637e6a8b646bddbad461a0bfac907ad3bf811 Mon Sep 17 00:00:00 2001
From: thoughtlessuser <thoughtlessuser@gmail.com>
Date: Mon, 13 Jul 2026 22:17:45 -0500
Subject: [PATCH 7/9] sprite

---
 .../Entities/Objects/Specific/Robotics/borg_modules.yml        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index a9ca46cdc5b..cf3aa8af84d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -243,6 +243,9 @@
   components:
   - type: Sprite
     sprite: _Mono/Objects/Specific/Robotics/borgmodule.rsi # Mono
+    layers:
+    - state: mercenary
+    - state: icon-mercenary
   - type: ItemBorgModule
     moduleId: Mercenary
     items:

From dc07b7af05fd4156d193e7c81771f094fd89ebe7 Mon Sep 17 00:00:00 2001
From: thoughtlessuser <thoughtlessuser@gmail.com>
Date: Tue, 14 Jul 2026 13:32:26 -0500
Subject: [PATCH 8/9] moreminimize

---
 .../Specific/Robotics/borg_modules.yml        | 36 +++++++++++-----
 .../Specific/Robotics/borg_modules.yml        | 43 -------------------
 Resources/Prototypes/borg_types.yml           |  1 -
 3 files changed, 26 insertions(+), 54 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index cf3aa8af84d..ab57e58ffc8 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -166,7 +166,8 @@
   - type: ItemBorgModule
     moduleId: Surveillance # mono
     items:
-    - GeigerCounter
+    - GasAnalyzer # Mono
+    - GeigerCounter # Mono
     - HandheldGPSBasic
     - HandHeldMassScannerBorg
 #    - HandheldStationMapUnpowered
@@ -343,7 +344,7 @@
  #   - PowerDrill
     - Multitool
     - WelderExperimental
-    - GasAnalyzer
+#    - GasAnalyzer
     - NaniteApplicatorExperimental # Monolith
     - RemoteSignaller
 #    - GeigerCounter
@@ -949,14 +950,29 @@
 #    - BoneGel
 # Mono - Replaced Droppable with entirely new module
 # Frontier -> GoobStation -> Monolith: droppable borg items
-#  - type: DroppableBorgModule
-#    moduleId: Surgery
-#    items:
-#    - id: OrganHumanBrain
-#      whitelist:
-#        components:
-#        - Organ
-#        - BodyPart
+  - type: DroppableBorgModule
+    moduleId: Surgery
+    items:
+    - id: OrganHumanBrain
+      whitelist:
+        components:
+        - Organ
+        - BodyPart
+    - id: OrganHumanHeart
+      whitelist:
+        components:
+        - Organ
+        - BodyPart
+    - id: OrganHumanLungs
+      whitelist:
+        components:
+        - Organ
+        - BodyPart
+    - id: OrganHumanLungs
+      whitelist:
+        components:
+        - Organ
+        - BodyPart
 # End Frontier -> GoobStation -> Monolith: droppable borg items
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: surgery-module }
diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Robotics/borg_modules.yml
index 24516b9f273..09619c622fe 100644
--- a/Resources/Prototypes/_Mono/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1,46 +1,3 @@
-# Medical Modules
-
-- type: entity
-  id: BorgModuleColdStorage
-  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: cold storage cyborg module
-  description: Provides a cyborg with a sterile place to store organs and body parts.
-  components:
-  - type: Sprite
-    layers:
-    - state: medical
-    - state: icon-treatment
-  - type: DroppableBorgModule
-    moduleId: ColdStorage
-    items:
-    - id: OrganHumanBrain
-      whitelist:
-        components:
-        - Organ
-        - BodyPart
-    - id: OrganHumanHeart
-      whitelist:
-        components:
-        - Organ
-        - BodyPart
-    - id: OrganHumanLungs
-      whitelist:
-        components:
-        - Organ
-        - BodyPart
-    - id: OrganHumanLiver
-      whitelist:
-        components:
-        - Organ
-        - BodyPart
-    - id: OrganHumanKidneys
-      whitelist:
-        components:
-        - Organ
-        - BodyPart
-  - type: BorgModuleIcon
-    icon: { sprite: _Mono/Interface/Action/actions_borg.rsi, state: cold-storage-module }
-
 # Mercenary Modules
 
 - type: entity
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index a2f4a8b927e..d82a1cba95a 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -169,7 +169,6 @@
   - BorgModuleSurgery # Mono
   - BorgModuleDefibrillator # Mono
   - BorgModuleSurveillance # Mono
-  - BorgModuleColdStorage # Mono
 
   radioChannels:
   - Science

From e40899f4bdcd2367eb02da3c8fa372ed885651f3 Mon Sep 17 00:00:00 2001
From: thoughtlessuser <thoughtlessuser@gmail.com>
Date: Tue, 14 Jul 2026 13:57:04 -0500
Subject: [PATCH 9/9] monotag

---
 .../Specific/Robotics/borg_modules.yml        | 66 +++++++++----------
 .../Entities/Structures/Machines/lathe.yml    |  2 +-
 .../Prototypes/Research/civilianservices.yml  |  2 +-
 .../_Mono/Research/experimental.yml           |  2 +-
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index ab57e58ffc8..9ee96dec4f7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -340,14 +340,14 @@
     moduleId: AdvancedTools # Frontier
     items:
     - OmnitoolBorg # Mono
- #   - JawsOfLife
- #   - PowerDrill
+ #   - JawsOfLife # Mono
+ #   - PowerDrill # Mono
     - Multitool
     - WelderExperimental
-#    - GasAnalyzer
+#    - GasAnalyzer # Mono
     - NaniteApplicatorExperimental # Monolith
     - RemoteSignaller
-#    - GeigerCounter
+#    - GeigerCounter # Mono
     - MaintenanceJack # Frontier
     - RPED
   - type: BorgModuleIcon
@@ -368,7 +368,7 @@
 #    items:
 #    - SheetSteelLingering0
 #    - SheetGlassLingering0
-#    - SheetPlasticLingering0
+#    - SheetPlasticLingering0                 # Mono
 #    - SheetPlasteelLingering0
 #    - PartRodMetalLingering0
 #    - FloorTileItemSteelLingering0
@@ -382,12 +382,12 @@
       whitelist:
         components:
         - ConstructionBag
-    - id: FloorTileItemSteel
+    - id: FloorTileItemSteel # Mono
       whitelist:
         components:
         - Material
         - FloorTile
-    - id: SheetSteel10
+    - id: SheetSteel10 # Mono
       whitelist:
         components:
         - Material
@@ -403,7 +403,7 @@
       whitelist:
         components:
         - MachinePart
-    - id: JerryCanWeldingFuel
+    - id: JerryCanWeldingFuel # Mono
       whitelist:
         components:
         - ReagentTank
@@ -416,8 +416,8 @@
 - type: entity
   id: BorgModuleRCD
   parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ]
-  name: matter manipulator cyborg module
-  description: Includes an RCD functionality and ship repair tool for a chassis to use.
+  name: matter manipulator cyborg module # Mono rebrand
+  description: Includes an RCD, RPD, and ship repair tool for a chassis to use.
   components:
   - type: Sprite
     layers:
@@ -443,7 +443,7 @@
 #    layers:
 #    - state: janitor
 #    - state: icon-light-replacer
-#  - type: ItemBorgModule
+#  - type: ItemBorgModule                     # Mono
 #    moduleId: LightReplacer # Frontier
 #    items:
 #    - LightReplacer
@@ -469,7 +469,7 @@
     # - Bucket # Frontier
     - TrashBag
   # Frontier: droppable items
-    - LightReplacer
+    - LightReplacer # Mono
   - type: DroppableBorgModule
     moduleId: Cleaning
     items:
@@ -514,7 +514,7 @@
 #    layers:
 #    - state: medical
 #    - state: icon-diagnosis
-#  - type: ItemBorgModule
+#  - type: ItemBorgModule                             # Mono
 #    moduleId: Diagnosis # Frontier
 #    items:
 #    - HandheldHealthAnalyzerUnpowered
@@ -559,6 +559,7 @@
     items:
     - EmergencyMedipenBorg # Mono
     - DefibrillatorOneHandedUnpowered
+    - HandheldHealthAnalyzerUnpowered # Mono
   - type: DroppableBorgModule # Mono
     moduleId: Defibrillator
     items:
@@ -581,7 +582,7 @@
 - type: entity
   id: BorgModuleAdvancedTreatment
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: chemistry cyborg module
+  name: chemistry cyborg module # Mono - rename from adv treatment
   description: Utilizes various tools for a cyborg to perform chemical manipulation and administration.
   components:
   - type: Sprite
@@ -628,11 +629,11 @@
     moduleId: Artifact # Frontier
     items:
     - NodeScanner
-    - AnomalyScanner
-    - AnomalyLocatorUnpowered
-    - AnomalyLocatorWideUnpowered
-    - RemoteSignaller
-    - Multitool
+    - AnomalyScanner # Mono
+    - AnomalyLocatorUnpowered # Mono
+    - AnomalyLocatorWideUnpowered # Mono
+    - RemoteSignaller # Mono
+    - Multitool # Mono
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: node-scanner-module }
 
@@ -649,7 +650,7 @@
 #  - type: ItemBorgModule
 #    moduleId: Anomaly # Frontier           
 #    items:
-#    - AnomalyScanner
+#    - AnomalyScanner                               # Mono
 #    - AnomalyLocatorUnpowered
 #    - AnomalyLocatorWideUnpowered
 #    - RemoteSignaller
@@ -691,7 +692,7 @@
         - NFLighter
 #    - id: DrinkShaker
 #      whitelist:
-#        components:
+#        components:    # Mono
 #        - NFShaker
   # End Frontier
   - type: BorgModuleIcon
@@ -716,7 +717,7 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: musical-module }
 
-- type: entity # Mono
+- type: entity # Mono addition
   id: BorgModuleBartending
   parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
   name: bartending cyborg module
@@ -798,7 +799,7 @@
 #    moduleId: Harvesting # Frontier
  #   items:
  #   - HydroponicsToolScythe
-#    - HydroponicsToolHatchet            # what psycho made TWO gardening modules
+#    - HydroponicsToolHatchet            # what psycho made TWO gardening modules - Mono
 #    # - PlantBag # Frontier
 #  # Frontier: droppable borg items
 #  - type: DroppableBorgModule
@@ -867,7 +868,7 @@
       - Emag
       - AccessBreaker
 #      - WeaponGrapplingGun # Mono
-#      - PinpointerSyndicateNuclear
+#      - PinpointerSyndicateNuclear # Mono
     - type: BorgModuleIcon
       icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-operative-module }
 
@@ -885,7 +886,7 @@
       moduleId: EnergySword # Frontier
       items:
       - CyborgEnergySwordDouble
-#      - PinpointerSyndicateNuclear
+#      - PinpointerSyndicateNuclear # Mono
     - type: BorgModuleIcon
       icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-esword-module }
 
@@ -903,7 +904,7 @@
       moduleId: L6CROW # Frontier
       items:
         - WeaponLightMachineGunL6C
- #       - PinpointerSyndicateNuclear
+ #       - PinpointerSyndicateNuclear # Mono
     - type: BorgModuleIcon
       icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-l6c-module }
 
@@ -942,13 +943,12 @@
     - OmnimedToolBorg # Mono
     - HandheldHealthAnalyzerUnpowered # Mono
 #    - Scalpel
-#    - Drill
+#    - Drill 
 #    - Hemostat
-#    - Retractor
+#    - Retractor              # Mono
 #    - Cautery
 #    - SawElectric
 #    - BoneGel
-# Mono - Replaced Droppable with entirely new module
 # Frontier -> GoobStation -> Monolith: droppable borg items
   - type: DroppableBorgModule
     moduleId: Surgery
@@ -958,17 +958,17 @@
         components:
         - Organ
         - BodyPart
-    - id: OrganHumanHeart
+    - id: OrganHumanHeart # Mono
       whitelist:
         components:
         - Organ
         - BodyPart
-    - id: OrganHumanLungs
+    - id: OrganHumanLungs # Mono
       whitelist:
         components:
         - Organ
         - BodyPart
-    - id: OrganHumanLungs
+    - id: OrganHumanLungs # Mono
       whitelist:
         components:
         - Organ
@@ -978,7 +978,7 @@
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: surgery-module }
 
 - type: entity # Mono
-  id: BorgModuleSurgeryKhorpeks
+  id: BorgModuleSurgeryKhorpeks # Mono - Adv surgery reskin - Normal surgery is faster
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
   name: khorpeks surgery cyborg module
   description: Equips a cyborg with nano-surgeon skills more capable than any modern hospitals throughout the galaxy. Product related injuries are not eligible for reconciliation.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 4d74b07713a..ac203051725 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -399,7 +399,7 @@
     - MechParts
     - MechEquipment
     # Shitmed Change
- #   - BorgModulesDynamic
+ #   - BorgModulesDynamic # Mono
     - SMCybernetics
     # Goob/Mono - modsuits
     - Modsuits
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index a90a89b8a19..3b1453dc650 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -176,7 +176,7 @@
   - EnergyScalpel
   - EnergyCautery
   - AdvancedRetractor
-#  - BorgModuleAdvancedSurgery
+#  - BorgModuleAdvancedSurgery # Mono
   - DefibrillatorCompact # Mono
   technologyPrerequisites:
   - SuperParts
diff --git a/Resources/Prototypes/_Mono/Research/experimental.yml b/Resources/Prototypes/_Mono/Research/experimental.yml
index c769f8ba4c5..c735dfbe2ea 100644
--- a/Resources/Prototypes/_Mono/Research/experimental.yml
+++ b/Resources/Prototypes/_Mono/Research/experimental.yml
@@ -36,7 +36,7 @@
   - AnomalyScanner
   - AnomalyLocator
   - AnomalyLocatorWide
-  #- BorgModuleAnomaly
+  #- BorgModuleAnomaly # Mono
   - APECircuitboard
   - AnomalyVesselCircuitboard
   - NodeScanner