diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
index f236522b53..83f1a3ddd1 100644
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
@@ -58,7 +58,7 @@ ent-WeaponIAR52Borg = cyborg's IAR-52
     .desc = High-speed SMG, equipped with a universal connector for other types of pistol magazines.
 ent-HypoBorgSaboteurSyndicate = the cyborg saboteur's hypospray
     .desc = { ent-BaseItem.desc }
-ent-HandheldCrewMonitorBorg = handheld robot crew monitor
+ent-HandheldEmergencyCrewMonitorBorg = handheld robot crew monitor
     .desc = A hand-held crew monitor that runs off of your own power cells, which displays the status of the crew suit sensors.
 ent-WeaponPlasmaCutterBorg = borg plasma cutter
     .desc = A mining tool that fires low-damage plasma bolts at a short range. This one is modified for cyborg use.
diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
index af67879124..a51de6a0bc 100644
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
@@ -58,7 +58,7 @@ ent-WeaponIAR52Borg = IAR-52 киборга
     .desc = Высокоскорострельный ПП, оборудован универсальным разъёмом для других типов пистолетных магазинов.
 ent-HypoBorgSaboteurSyndicate = гипоспрей киборга диверсанта
     .desc = { ent-BaseItem.desc }
-ent-HandheldCrewMonitorBorg = портативный монитор экипажа киборга
+ent-HandheldEmergencyCrewMonitorBorg = портативный монитор экипажа киборга
     .desc = { ent-HandheldCrewMonitor.desc }
 ent-WeaponPlasmaCutterBorg = плазменный резак борга
     .desc = Инструмент для добычи, стреляющий плазменными зарядами с малым уроном на близком расстоянии. Этот модифицирован для использования киборгами и имеет автоматический режим стрельбы.
diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl
index b3cc442635..7f4434a234 100644
--- a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl
@@ -4,7 +4,7 @@ research-technology-basic-cyberlimbs = Базовые кибер-конечно
 research-technology-implant-extractor-safety = Безопасное извлечение имплантов
 research-technology-implant-extractor = Извлечение имплантов
 research-technology-advanced-surgery = Продвинутая хирургия
-research-technology-hanheld-crew-monitor = Портативный мониторинг
+research-technology-hanheld-crew-monitor = Портативный мониторинг Пульс-Гард
 research-technology-mechanized-medical-treatment = Механизированное лечение
 research-technology-handcraft-nvd = Кустарные ПНВ
 research-technology-basic-nvd = Продвинутое ПНВ
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 240177e94d..68369a6b78 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -122,7 +122,7 @@
   id: LockerFillParamedic
   table: !type:AllSelector
     children:
-    - id: HandheldCrewMonitor # Sunrise-Edit
+    - id: HandheldEmergencyCrewMonitor # Sunrise-Edit
     - id: ClothingOuterHardsuitVoidParamed
     - id: ClothingOuterCoatParamedicWB
     - id: ClothingHeadHatParamedicsoft
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 61940f5bd8..6e881252df 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -104,7 +104,7 @@
     instantActions:
     - PortableSurveillanceCameraMonitorUnpowered
     - HandheldStationMapUnpowered
-    - HandheldCrewMonitorBorg
+    - HandheldEmergencyCrewMonitorBorg
     entityTargetActions:
     - HandheldHealthAnalyzerUnpowered
   - type: BorgBrain
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 2a2f66132c..986ac8fb3e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -25,12 +25,11 @@
   - type: StationLimitedNetwork
   - type: StaticPrice
     price: 500
-#    Sunrise-Edit
-#  - type: Tag
-#    tags:
-#    - HighRiskItem
-#  - type: StealTarget
-#    stealGroup: HandheldCrewMonitor
+  - type: Tag
+    tags:
+    - HighRiskItem
+  - type: StealTarget
+    stealGroup: HandheldCrewMonitor
 
 - type: entity
   id: HandheldCrewMonitorEmpty
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 1f17dae71c..ac3dd459d6 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -7,13 +7,12 @@
     sprite: Objects/Specific/Medical/hypospray.rsi
     state: hypo
 
-# Sunrise-Edit
-#- type: stealTargetGroup
-#  id: HandheldCrewMonitor
-#  name: steal-target-groups-handheld-crew-monitor
-#  sprite:
-#    sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
-#    state: scanner
+- type: stealTargetGroup
+  id: HandheldCrewMonitor
+  name: steal-target-groups-handheld-crew-monitor
+  sprite:
+    sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
+    state: scanner
 
 - type: stealTargetGroup
   id: ClothingOuterHardsuitRd
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index 39eb65154a..6c75ef03ea 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -219,13 +219,12 @@
   - type: StealCondition
     stealGroup: Hypospray
 
-# Sunrise-Edit
-#- type: entity
-#  parent: BaseCMOStealObjective
-#  id: CMOCrewMonitorStealObjective
-#  components:
-#  - type: StealCondition
-#    stealGroup: HandheldCrewMonitor
+- type: entity
+  parent: BaseCMOStealObjective
+  id: CMOCrewMonitorStealObjective
+  components:
+  - type: StealCondition
+    stealGroup: HandheldCrewMonitor
 
 ## rd
 
diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Cyborgs/borg_chassis.yml
index dd49fd393f..15ff9fa825 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -213,7 +213,7 @@
     instantActions:
     - PortableSurveillanceCameraMonitorUnpowered
     - HandheldStationMapUnpowered
-    - HandheldCrewMonitorBorg
+    - HandheldEmergencyCrewMonitorBorg
     - HandHeldMassScannerBorg
   - type: MobThresholds
     thresholds:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
index 730fc2ff1e..44756fda45 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
@@ -717,8 +717,8 @@
     - HyposprayInjectMode
 
 - type: entity
-  parent: HandheldCrewMonitor
-  id: HandheldCrewMonitorBorg
+  parent: HandheldEmergencyCrewMonitor
+  id: HandheldEmergencyCrewMonitorBorg
   name: handheld robot crew monitor
   description: A hand-held crew monitor that runs off of your own power cells, which displays the status of the crew suit sensors.
   categories: [ HideSpawnMenu ]
diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml
index 21d7c3abff..84d199d246 100644
--- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml
@@ -20,7 +20,7 @@
   - SyringeCryostasis
   - AutoMenderBurn
   - AutoMenderBrute
-  - HandheldCrewMonitor
+  - HandheldEmergencyCrewMonitor
   - BlankMediPen
   - ImplanterExtractor
   - DefibrillatorCompact
diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml
index ff4edb1646..2125a5b8db 100644
--- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml
@@ -8,8 +8,8 @@
     Silver: 100
 
 - type: latheRecipe
-  id: HandheldCrewMonitor
-  result: HandheldCrewMonitorEmpty
+  id: HandheldEmergencyCrewMonitor
+  result: HandheldEmergencyCrewMonitorEmpty
   categories:
   - Tools
   completetime: 4
@@ -18,6 +18,7 @@
     Steel: 250
     Plastic: 400
     Gold: 100
+    Plasma: 50
 
 - type: latheRecipe
   id: DefibrillatorCompact
diff --git a/Resources/Prototypes/_Sunrise/Research/medical.yml b/Resources/Prototypes/_Sunrise/Research/medical.yml
index b368d59022..5c23c591ab 100644
--- a/Resources/Prototypes/_Sunrise/Research/medical.yml
+++ b/Resources/Prototypes/_Sunrise/Research/medical.yml
@@ -96,16 +96,16 @@
     - ImplantExtractor
 
 - type: technology
-  id: HandheldCrewMonitorTech
+  id: HandheldEmergencyCrewMonitorTech
   name: research-technology-hanheld-crew-monitor
   icon:
-    sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
+    sprite: _Sunrise/Objects/Specific/Medical/handheld_emergency_crewmonitor.rsi
     state: scanner
   discipline: Biochemical
   tier: 2
   cost: 9000
   recipeUnlocks:
-    - HandheldCrewMonitor
+    - HandheldEmergencyCrewMonitor
   technologyPrerequisites:
     - SurgeryTech
 
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/blueshield_operative.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/blueshield_operative.yml
index ea75a0819d..56da957a11 100644
--- a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/blueshield_operative.yml
+++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/blueshield_operative.yml
@@ -40,7 +40,7 @@
     pocket2: WeaponTaser
   storage:
     back:
-    - HandheldCrewMonitor
+    - HandheldBSOCrewMonitor
 
 - type: chameleonOutfit
   id: BlueShieldOperativeChameleonOutfit
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index 3b61988fb3..a87d34f7b8 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -270,7 +270,7 @@
   - type: InnateItem
     instantActions:
     - HandheldStationMapUnpowered
-    - HandheldCrewMonitorBorg
+    - HandheldEmergencyCrewMonitor
     entityTargetActions:
     - HandheldHealthAnalyzerUnpowered
   # Sunrise-End