From 15b042377760380dfe40a37f93ad001ce07e3ba2 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 23 Apr 2023 20:07:41 -0400 Subject: [PATCH] printed health analyzers and crew monitors no longer have batteries (#15699) --- .../Objects/Specific/Medical/handheld_crew_monitor.yml | 10 ++++++++++ .../Objects/Specific/Medical/healthanalyzer.yml | 10 ++++++++++ .../Entities/Objects/Specific/Research/anomaly.yml | 4 ++-- Resources/Prototypes/Entities/Objects/base_item.yml | 2 -- Resources/Prototypes/Recipes/Lathes/devices.yml | 2 +- Resources/Prototypes/Recipes/Lathes/medical.yml | 4 ++-- 6 files changed, 25 insertions(+), 7 deletions(-) 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 b64b7b087f..6fdb04cb3a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml @@ -29,3 +29,13 @@ - type: StationLimitedNetwork - type: StaticPrice price: 500 + +- type: entity + id: HandheldCrewMonitorEmpty + parent: HandheldCrewMonitor + suffix: Empty + components: + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml index a36bf732f9..8c5dece0f9 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml @@ -28,6 +28,16 @@ tags: - DiscreteHealthAnalyzer +- type: entity + id: HandheldHealthAnalyzerEmpty + parent: HandheldHealthAnalyzer + suffix: Empty + components: + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + - type: entity parent: HandheldHealthAnalyzer id: HandheldHealthAnalyzerGigacancer diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml index a91be8c588..f58ee19e65 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml @@ -55,9 +55,9 @@ volume: -8 - type: entity - id: AnomalyLocatorNoBattery + id: AnomalyLocatorEmpty parent: AnomalyLocator - suffix: No Battery + suffix: Empty components: - type: ItemSlots slots: diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml index bd17cea822..4a677c46af 100644 --- a/Resources/Prototypes/Entities/Objects/base_item.yml +++ b/Resources/Prototypes/Entities/Objects/base_item.yml @@ -64,7 +64,6 @@ # PowerCellSlot parents - type: entity - name: a id: PowerCellSlotSmallItem abstract: true components: @@ -80,7 +79,6 @@ startingItem: PowerCellSmall - type: entity - name: a id: PowerCellSlotMediumItem abstract: true components: diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index 00adffa50a..0fbfd7ccb4 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -51,7 +51,7 @@ - type: latheRecipe id: AnomalyLocator - result: AnomalyLocatorNoBattery + result: AnomalyLocatorEmpty completetime: 3 materials: Steel: 400 diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index bcb32a9626..40fd4fc504 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -50,7 +50,7 @@ - type: latheRecipe id: HandheldCrewMonitor - result: HandheldCrewMonitor + result: HandheldCrewMonitorEmpty completetime: 2 materials: Glass: 1200 @@ -59,7 +59,7 @@ - type: latheRecipe id: HandheldHealthAnalyzer - result: HandheldHealthAnalyzer + result: HandheldHealthAnalyzerEmpty completetime: 4 materials: Glass: 500 -- 2.51.2