From f36d2784993604d0552549db805fb0f0a024a3a3 Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Mon, 29 Aug 2022 22:31:27 -0400 Subject: [PATCH] Biomass (#10313) * Material * good prototype * Fix material storage * You can insert biomass into the cloner * ok, basic biomass subtraction works * amogus * ok chance works * Alright, the biomass and genetic stuff works * feedback for cloning * more reclaimer polish * ship it * starting biomass + fix lathes * I changed my mind on rat mass and these guys are definitely getting ground up * Doafter * clean up, sync the two * fix naming, fix mass * technology + construction * additional logging, stop unanchoring when active * fix event / logs * dont gib dead salvage * auto eject * fix deconstruction behavior * make warning message better, temporarily disable cancer scanner * fix biomass stacks * add easy mode CVAR * stack cleanup, make biomass 2x as fast * bugfix * new sprite from hyenh * fix tests * hello? :smilethink: * :smilethink: * medical scanner gets antirotting * fix cloner and medical scanner Co-authored-by: Moony --- .../UI/CloningConsoleBoundUserInterface.cs | 2 - .../UI/CloningConsoleWindow.xaml | 5 - Content.Server/Atmos/Miasma/MiasmaSystem.cs | 1 - Content.Server/Climbing/ClimbSystem.cs | 20 +- .../Cloning/CloningConsoleSystem.cs | 20 +- Content.Server/Cloning/CloningSystem.cs | 160 ++++++++++-- .../Cloning/Components/CloningPodComponent.cs | 2 + .../Lathe/Components/LatheComponent.cs | 23 -- .../Components/MaterialStorageComponent.cs | 33 +++ Content.Server/Lathe/LatheSystem.cs | 30 ++- .../ActiveBiomassReclaimerComponent.cs | 6 + .../BiomassReclaimerComponent.cs | 53 ++++ .../BiomassReclaimerSystem.cs | 245 ++++++++++++++++++ .../Medical/MedicalScannerSystem.cs | 2 +- .../Salvage/SalvageMobRestrictionsSystem.cs | 3 + Content.Server/Stack/StackSystem.cs | 38 +++ Content.Shared/CCVar/CCVars.cs | 11 + .../Jittering/SharedJitteringSystem.cs | 11 + Resources/Audio/Ambience/Objects/license.txt | 1 + .../Ambience/Objects/reclaimer_ambience.ogg | Bin 0 -> 597756 bytes Resources/Audio/Machines/license.txt | 4 +- .../Audio/Machines/reclaimer_startup.ogg | Bin 0 -> 35969 bytes Resources/Locale/en-US/lathe/lathesystem.ftl | 2 +- .../components/cloning-console-component.ftl | 3 + .../components/cloning-pod-component.ftl | 1 + .../Catalog/Fills/Lockers/heads.yml | 2 + .../Catalog/Research/technologies.yml | 3 +- .../Prototypes/Catalog/uplink_catalog.yml | 18 +- .../Entities/Mobs/NPCs/regalrat.yml | 16 +- .../Circuitboards/Machine/production.yml | 25 ++ .../Entities/Objects/Materials/materials.yml | 26 ++ .../Machines/Computers/computers.yml | 2 + .../Machines/Medical/biomass_reclaimer.yml | 23 ++ .../{ => Medical}/disease_diagnoser.yml | 0 .../Machines/{ => Medical}/vaccinator.yml | 0 .../Structures/Machines/cloning_machine.yml | 10 +- .../Entities/Structures/Machines/lathe.yml | 28 +- .../Structures/Machines/medical_scanner.yml | 8 +- .../Reagents/Materials/materials.yml | 7 + .../Construction/Graphs/machines/machine.yml | 2 +- .../Prototypes/Recipes/Lathes/electronics.yml | 10 + .../Prototypes/Stacks/Materials/materials.yml | 8 +- .../Medical/biomass_reclaimer.rsi/icon.png | Bin 0 -> 6424 bytes .../Medical/biomass_reclaimer.rsi/meta.json | 14 + 44 files changed, 764 insertions(+), 114 deletions(-) create mode 100644 Content.Server/Medical/BiomassReclaimer/ActiveBiomassReclaimerComponent.cs create mode 100644 Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs create mode 100644 Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs create mode 100644 Resources/Audio/Ambience/Objects/reclaimer_ambience.ogg create mode 100644 Resources/Audio/Machines/reclaimer_startup.ogg create mode 100644 Resources/Locale/en-US/medical/components/cloning-pod-component.ftl create mode 100644 Resources/Prototypes/Entities/Structures/Machines/Medical/biomass_reclaimer.yml rename Resources/Prototypes/Entities/Structures/Machines/{ => Medical}/disease_diagnoser.yml (100%) rename Resources/Prototypes/Entities/Structures/Machines/{ => Medical}/vaccinator.yml (100%) create mode 100644 Resources/Textures/Structures/Machines/Medical/biomass_reclaimer.rsi/icon.png create mode 100644 Resources/Textures/Structures/Machines/Medical/biomass_reclaimer.rsi/meta.json diff --git a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs index 8ab2c34627..51ee9d7b4e 100644 --- a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs +++ b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs @@ -22,7 +22,6 @@ namespace Content.Client.CloningConsole.UI }; _window.OnClose += Close; _window.CloneButton.OnPressed += _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone)); - _window.EjectButton.OnPressed += _ => SendMessage(new UiButtonPressedMessage(UiButton.Eject)); _window.OpenCentered(); } @@ -43,7 +42,6 @@ namespace Content.Client.CloningConsole.UI { _window.OnClose -= Close; _window.CloneButton.OnPressed -= _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone)); - _window.EjectButton.OnPressed -= _ => SendMessage(new UiButtonPressedMessage(UiButton.Eject)); } _window?.Dispose(); } diff --git a/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml b/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml index 7a1886a5af..958bc83d11 100644 --- a/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml +++ b/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml @@ -46,11 +46,6 @@ -