Remove battery from the handheld health analyzer (#42292)

* commit

* review

* review 2

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index 59efee2e6990f1aca4e09048fdc8bdb1f98b75bf..c3f7dde742295d28724582786a8028a2df1f8145 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -1,19 +1,15 @@
 - type: entity
-  id: HandheldHealthAnalyzerUnpowered
   parent: BaseItem
+  id: HandheldHealthAnalyzer
   name: health analyzer
-  suffix: Always Powered
   description: A hand-held body scanner capable of distinguishing vital signs of the subject.
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/healthanalyzer.rsi
-    state: icon
     layers:
-      - state: icon
-      - state: analyzer
-        shader: unshaded
-        visible: true
-        map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+    - state: icon
+    - state: analyzer
+      shader: unshaded
   - type: Item
     heldPrefix: analyzer
     storedRotation: -90
@@ -30,43 +26,7 @@
       path: "/Audio/Items/Medical/healthscanner.ogg"
   - type: Tag
     tags:
-      - DiscreteHealthAnalyzer
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.BatteryVisuals.State:
-        enum.PowerDeviceVisualLayers.Powered:
-          Full: { visible: true }
-          Neither: { visible: true }
-          Empty: { visible: false }
+    - DiscreteHealthAnalyzer
   - type: GuideHelp
     guides:
     - MedicalDoctor
-
-- type: entity
-  id: HandheldHealthAnalyzer
-  parent: [ HandheldHealthAnalyzerUnpowered, PowerCellSlotSmallItem]
-  suffix: ""
-  components:
-  - type: BatteryVisuals
-  - type: PowerCellDraw
-    drawRate: 1.2 #Calculated for 5 minutes on a small cell
-  - type: ToggleCellDraw
-  - type: ActivatableUIRequiresPowerCell
-
-- type: entity
-  id: HandheldHealthAnalyzerEmpty
-  parent: HandheldHealthAnalyzer
-  suffix: Empty
-  components:
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-  - type: Sprite
-    layers:
-    - state: icon
-    - state: analyzer
-      shader: unshaded
-      visible: false
-      map: [ "enum.PowerDeviceVisualLayers.Powered" ]

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 7ad58ef5eb5589d598af45ade322dd8ef4f230cc..9e45de1c11c599a0ab0573d5addaeaed41c15d41 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -855,7 +855,7 @@
     - state: icon-diagnosis
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: ClothingNeckStethoscope
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: diagnosis-module }
@@ -871,7 +871,7 @@
     - state: icon-treatment
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: Gauze
       hand:
         emptyLabel: borg-slot-topicals-empty
@@ -914,7 +914,7 @@
     - state: icon-defib
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: DefibrillatorOneHandedUnpowered
     - item: Crowbar
     - item: BorgFireExtinguisher
@@ -934,7 +934,7 @@
     - state: icon-chem
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: Syringe
     - item: BorgDropper
     - item: BaseChemistryEmptyVial
@@ -973,7 +973,7 @@
     - state: icon-chemist
   - type: ItemBorgModule
     hands:
-    - item: HandheldHealthAnalyzerUnpowered
+    - item: HandheldHealthAnalyzer
     - item: BorgHypo
     - item: Syringe
     - item: BorgDropper

diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index b8b39ae175c867425ea6fe9b9f3d004ec8647e68..b81066d067ecd9c2cd8bbd651291ed2b48400cf6 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -74,7 +74,7 @@
 
 - type: latheRecipe
   id: HandheldHealthAnalyzer
-  result: HandheldHealthAnalyzerEmpty
+  result: HandheldHealthAnalyzer
   categories:
   - Tools
   completetime: 4

diff --git a/Resources/migration.yml b/Resources/migration.yml
index d5059b3a225eebbf1fea3c5a0ba6e6f8d0841bed..53c7093d089a2415d2d8bc9893a174507e14ab9c 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -759,3 +759,7 @@ SpawnPointBoxer: null
 FigureSpawner: MechFigurineSpawner50
 ToySpawner: PlushieSpawner50
 SpacemenFigureSpawner: SpacemenFigurineSpawner90
+
+# 2026-01-07
+HandheldHealthAnalyzerUnpowered: HandheldHealthAnalyzer
+HandheldHealthAnalyzerEmpty: HandheldHealthAnalyzer