From 71b6dfc0b115c25237bbe0dbaca66482d9e3682d Mon Sep 17 00:00:00 2001 From: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Date: Thu, 30 Jul 2026 12:30:47 -0500 Subject: [PATCH] Add Remote Medical Tracking to T3 Biochemical Tree (#6272) * Added handheld monitors to the research tree. * changed logi crate parent * Added new board to dynamic pack * Namespaced new entity * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Apply suggestions from code review Co-authored-by: Radezolid Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> --------- Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Radezolid --- .../en-US/_DV/research/technologies.ftl | 1 + .../Catalog/Cargo/cargo_science.yml | 4 ++-- .../Objects/Specific/Research/disk.yml | 2 +- .../_DV/Catalog/Fills/Crates/medical.yml | 14 +++++++++++++ .../_DV/Recipes/Lathes/Packs/medical.yml | 1 + .../_DV/Recipes/Lathes/machine_boards.yml | 8 +++++++- .../Prototypes/_DV/Research/biochemical.yml | 20 +++++++++++++++---- 7 files changed, 42 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/_DV/research/technologies.ftl b/Resources/Locale/en-US/_DV/research/technologies.ftl index d4edf3cee06..13f90cf1306 100644 --- a/Resources/Locale/en-US/_DV/research/technologies.ftl +++ b/Resources/Locale/en-US/_DV/research/technologies.ftl @@ -20,6 +20,7 @@ research-technology-service-borg-module = Advanced Service Borg Modules # Biochemical research-technology-basic-augmentation = Basic Augmentation research-technology-implanted-tools = Implanted Tools +research-technology-medical-tracking = Remote Medical Tracking # Arsenal research-technology-exotic-ammunition = Exotic Ammunition diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml index d73b087ea6c..005e70d6fea 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml @@ -43,9 +43,9 @@ icon: sprite: Structures/Machines/server.rsi state: server - product: CrateCrewMonitoring + product: CrateCrewMonitoringDV # DeltaV - Was CrateCrewMonitoring cost: 2000 - category: cargoproduct-category-name-epistemics # DeltaV - Science renamed to Epistemics + category: cargoproduct-category-name-medical # DeltaV - Was science, now medical group: market - type: cargoProduct diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index 38b6ddf6575..2abfc406103 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -75,7 +75,7 @@ Arsenal: { color: "#dc373b" } Experimental: { color: "#9a6ef0" } CivilianServices: { color: "#7ecd48" } - + Biochemical: { color: "#449ae6" } # DeltaV - Biochem tree enum.TechDiskVisuals.Tier: t2_marks: 2: { visible: true } diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml index 8cbd3ea3656..6f3388ac529 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml @@ -58,3 +58,17 @@ entity_storage: !type:AllSelector children: - id: CrashCart + +- type: entity + parent: CrateMedicalSecure + id: CrateCrewMonitoringDV + name: crew monitoring crate + description: Contains a flatpack of a crew monitoring server and a few crew monitoring computers. Requires Medical access to open. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: CrewMonitoringServerFlatpack + - id: CrewMonitoringComputerFlatpack + amount: 3 diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml index 79446ab72c1..a1b73e343f7 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml @@ -30,6 +30,7 @@ id: MedicalBoardsDeltaV recipes: - CrewMonitoringComputerCircuitboard + - CrewMonitoringServerMachineCircuitboard - CloningConsoleComputerCircuitboard - MedicalScannerMachineCircuitboard - CloningPodMachineCircuitboard diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/machine_boards.yml b/Resources/Prototypes/_DV/Recipes/Lathes/machine_boards.yml index 343a21e83af..3874a5a7f1c 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/machine_boards.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/machine_boards.yml @@ -1,5 +1,11 @@ -# Atmos +#MARK: Atmos - type: latheRecipe parent: [ BaseCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ] id: KitchenFreezerMachineCircuitBoard result: KitchenFreezerMachineCircuitBoard + +#MARK: Medical +- type: latheRecipe + parent: [ BaseCircuitboardRecipe, BaseMedicalMachineRecipeCategory ] + id: CrewMonitoringServerMachineCircuitboard + result: CrewMonitoringServerMachineCircuitboard diff --git a/Resources/Prototypes/_DV/Research/biochemical.yml b/Resources/Prototypes/_DV/Research/biochemical.yml index 7839400a5ba..451298c69ec 100644 --- a/Resources/Prototypes/_DV/Research/biochemical.yml +++ b/Resources/Prototypes/_DV/Research/biochemical.yml @@ -1,6 +1,4 @@ -# Tier 1 - -# Tier 2 +#MARK: Tier 2 - type: technology id: Cloning @@ -17,4 +15,18 @@ - MedicalScannerMachineCircuitboard - CloningPodMachineCircuitboard -# Tier 3 +#MARK: Tier 3 + +- type: technology + id: MedicalTracking + name: research-technology-medical-tracking + icon: + sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi + state: scanner + discipline: Biochemical + tier: 3 + cost: 15000 + recipeUnlocks: + - HandheldCrewMonitor + - CrewMonitoringServerMachineCircuitboard + - CrewMonitoringComputerCircuitboard