Merge pull request #14

Borg crew monitor + slight refactor
new-frontiers-14 · Jul 9, 2023 · 20246f4 · 20246f4
2 parents e4a7399 + 9b9876d
commit 20246f4
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 35 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -205,27 +205,6 @@
       autoRecharge: true
       autoRechargeRate: 0.16667 #takes about 5 minutes to charge itself back to full
 
-- type: entity
-  name: silicon integrated power cell
-  description: A rechargeable modified microreactor cell. Intended for cyborg devices, it slowly recharges by itself.
-  id: PowerCellSiliconTool
-  suffix: Full
-  parent: BasePowerCell
-  components:
-    - type: Sprite
-      layers:
-      - map: [ "enum.PowerCellVisualLayers.Base" ]
-        state: microreactor
-      - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
-        state: o2
-        shader: unshaded
-    - type: Battery
-      maxCharge: 200
-      startingCharge: 200
-    - type: BatterySelfRecharger
-      autoRecharge: true
-      autoRechargeRate: 0.66667 #takes about 5 minutes to charge itself back to full
-
 - type: entity
   name: antique power cell prototype
   description: A small cell that self recharges. Used in old laser arms research.

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -52,14 +52,3 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
-
-- type: entity
-  id: HandheldHealthAnalyzerSilicon
-  parent: HandheldHealthAnalyzer
-  suffix: Silicon
-  components:
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellSiliconTool
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Borgs/borgs_tools.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Borgs/borgs_tools.yml
@@ -0,0 +1,21 @@
+- type: entity
+  id: HandheldHealthAnalyzerBorg
+  parent: HandheldHealthAnalyzer
+  suffix: Borg
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellBorgTool
+
+- type: entity
+  id: HandheldCrewMonitorBorg
+  parent: HandheldCrewMonitor
+  suffix: Borg
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellBorgTool
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Power/powercells.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Power/powercells.yml
@@ -0,0 +1,13 @@
+- type: entity
+  name: borg integrated power cell
+  description: A rechargeable modified microreactor cell. Intended for cyborg tools, it slowly recharges by itself.
+  id: PowerCellBorgTool
+  suffix: Full
+  parent: PowerCellMicroreactor
+  components:
+    - type: Battery
+      maxCharge: 200
+      startingCharge: 200
+    - type: BatterySelfRecharger
+      autoRecharge: true
+      autoRechargeRate: 0.66667 #takes about 5 minutes to charge itself back to full
diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/Player/borgs.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/Player/borgs.yml
@@ -191,7 +191,7 @@
     slots:
       analyzer_slot:
         name: HealthAnalyzer
-        startingItem: HandheldHealthAnalyzerSilicon
+        startingItem: HandheldHealthAnalyzerBorg
         locked: true
       hypospray_slot:
         name: Hypospray
@@ -226,8 +226,8 @@
     tools:
       - id: HyposprayBorgMedical
       - id: Syringe
-      - id: HandheldHealthAnalyzerSilicon
-      - id: HandheldCrewMonitor
+      - id: HandheldHealthAnalyzerBorg
+      - id: HandheldCrewMonitorBorg
       - id: FireExtinguisher
       - id: StackHolderHealingItem
   - type: ItemSlots