nuke biochem research discipline (#24871)

* make chem machine boards roundstart

* nuke biochem

* kill

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 411ce429ab70e500a5d0c5587ff52dbf00625959..37f0bb58824d676f5b1954bf59963b7f9340aa07 100644 (file)
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -1,6 +1,5 @@
 research-discipline-none = None
 research-discipline-industrial = Industrial
-research-discipline-biochemical = Biochemical
 research-discipline-arsenal = Arsenal
 research-discipline-experimental = Experimental
 research-discipline-civilian-services = Civilian Services
@@ -21,18 +20,6 @@ research-technology-super-powercells = Super Powercells
 research-technology-bluespace-storage = Bluespace Storage
 research-technology-portable-fission = Portable Fission
 
-research-technology-chemistry = Chemistry
-research-technology-surgical-tools = Surgical Tools
-research-technology-biochemical-stasis = Biochemical Stasis
-research-technology-mechanized-treatment = Mechanized Treatment
-research-technology-virology = Virology
-research-technology-cryogenics = Cryogenics
-research-technology-chemical-dispensary = Chemical Dispensary
-research-technology-biofabrication = Biofabrication
-research-technology-crew-monitoring = Crew Monitoring
-research-technology-bluespace-chemistry = Bluespace Chemistry
-research-technology-cloning = Cloning
-
 research-technology-salvage-weapons = Salvage Weapons
 research-technology-draconic-munitions = Draconic Munitions
 research-technology-uranium-munitions = Uranium Munitions
@@ -72,6 +59,8 @@ research-technology-food-service = Food Service
 research-technology-advanced-entertainment = Advanced Entertainment
 research-technology-audio-visual-communication = A/V Communication
 research-technology-faux-astro-tiles = Faux Astro-Tiles
+research-technology-biochemical-stasis = Biochemical Stasis
+research-technology-mechanized-treatment = Mechanized Treatment
 research-technology-robotic-cleanliness = Robotic Cleanliness
 research-technology-advanced-cleaning = Advanced Cleaning
 research-technology-meat-manipulation = Meat Manipulation
@@ -79,3 +68,4 @@ research-technology-honk-mech = H.O.N.K. Mech
 research-technology-advanced-spray = Advanced Spray
 research-technology-bluespace-cargo-transport = Bluespace Cargo Transport
 research-technology-quantum-fiber-weaving = Quantum Fiber Weaving
+research-technology-bluespace-chemistry = Bluespace Chemistry

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 58ddd50a270f98b9bb731d854152e0ef35b420a3..71c8c38cc2dc9df2e1e3297321dd5ec1e2f47d1d 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -252,6 +252,10 @@
   - type: Lathe
     idleState: icon
     runningState: building
+    staticRecipes:
+    - LargeBeaker
+    - Dropper
+    - ClothingEyesGlassesChemical
     dynamicRecipes:
       - PowerDrill
       - MiningDrill
@@ -266,11 +270,8 @@
       - HoloprojectorField
       - Saw
       - Hemostat
-      - Beaker
-      - LargeBeaker
       - CryostasisBeaker
       - SyringeCryostasis
-      - Dropper
       - Syringe
       - Implanter
       - PillCanister
@@ -309,7 +310,6 @@
       - ClothingBackpackDuffelHolding
       - WelderExperimental
       - JawsOfLife
-      - ClothingEyesGlassesChemical
       - FauxTileAstroGrass
       - FauxTileAstroIce
       - OreBagOfHolding
@@ -368,7 +368,10 @@
     - MaterialReclaimerMachineCircuitboard
     - ElectrolysisUnitMachineCircuitboard
     - CentrifugeMachineCircuitboard
+    - ChemDispenserMachineCircuitboard
+    - ChemMasterMachineCircuitboard
     - CondenserMachineCircuitBoard
+    - HotplateMachineCircuitboard
     - UniformPrinterMachineCircuitboard
     - FloorGreenCircuit
     - FloorBlueCircuit
@@ -381,8 +384,6 @@
       - CryoPodMachineCircuitboard
       - VaccinatorMachineCircuitboard
       - DiagnoserMachineCircuitboard
-      - ChemMasterMachineCircuitboard
-      - ChemDispenserMachineCircuitboard
       - BiomassReclaimerMachineCircuitboard
       - BiofabricatorMachineCircuitboard
       - SurveillanceCameraRouterCircuitboard
@@ -400,7 +401,6 @@
       - AutolatheHyperConvectionMachineCircuitboard
       - ProtolatheHyperConvectionMachineCircuitboard
       - ReagentGrinderMachineCircuitboard
-      - HotplateMachineCircuitboard
       - MicrowaveMachineCircuitboard
       - ElectricGrillMachineCircuitboard
       - FatExtractorMachineCircuitboard
@@ -803,9 +803,13 @@
       - Defibrillator
       - HandheldHealthAnalyzer
       - ClothingHandsGlovesLatex
+      - ClothingHandsGlovesNitrile
       - ClothingMaskSterile
       - DiseaseSwab
       - Beaker
+      - LargeBeaker
+      - Dropper
+      - Jug
       - Syringe
       - Implanter
       - PillCanister
@@ -822,20 +826,18 @@
       - MedkitAdvanced
       - MedkitRadiation
       - MedkitCombat
-    dynamicRecipes:
-      - ClothingHandsGlovesNitrile
-      - CryostasisBeaker
-      - LargeBeaker
-      - Dropper
       - Scalpel
       - Retractor
       - Cautery
       - Drill
       - Saw
       - Hemostat
+      - ClothingEyesGlassesChemical
+    dynamicRecipes:
+      - ChemicalPayload
+      - CryostasisBeaker
       - BluespaceBeaker
       - SyringeBluespace
-      - Jug
       - SyringeCryostasis
   - type: Machine
     board: MedicalTechFabCircuitboard

diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
index 66ea8e538ad96d269c8e63bd876e88fca58fe678..7b369f62cc980c0edab13772785e89fe4a2b468a 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -15,7 +15,6 @@
   - type: TechnologyDatabase
     supportedDisciplines:
     - Industrial
-    - Biochemical
     - Arsenal
     - Experimental
     - CivilianServices

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 71e85c691aaec6bce31332158abd7b389f552031..8a0fe5d77cb76c50bebcaa9487148768c24e6790 100644 (file)
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -50,6 +50,7 @@
   - TimerTrigger
   - FlashPayload
   - ExplosivePayload
+  - ChemicalPayload
   - Igniter
 
 - type: technology
@@ -207,4 +208,4 @@
   - PowerCageHigh
   - ShuttleGunDusterCircuitboard
   technologyPrerequisites:
-  - BasicShuttleArmament
\ No newline at end of file
+  - BasicShuttleArmament

diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml
deleted file mode 100644 (file)
index 78deef6..0000000
--- a/Resources/Prototypes/Research/biochemical.yml
+++ /dev/null
@@ -1,151 +0,0 @@
-# Tier 1
-
-- type: technology
-  id: Chemistry
-  name: research-technology-chemistry
-  icon:
-    sprite: Objects/Specific/Chemistry/beaker_large.rsi
-    state: beakerlarge
-  discipline: Biochemical
-  tier: 1
-  cost: 5000
-  recipeUnlocks:
-  - LargeBeaker
-  - Dropper
-  - HotplateMachineCircuitboard
-  - ChemicalPayload
-  - ClothingEyesGlassesChemical
-  - Jug
-
-- type: technology
-  id: SurgicalTools
-  name: research-technology-surgical-tools
-  icon:
-    sprite: Objects/Specific/Medical/Surgery/saw.rsi
-    state: saw
-  discipline: Biochemical
-  tier: 1
-  cost: 2500 #this is useless so heavy decrease
-  recipeUnlocks:
-  - Scalpel
-  - Retractor
-  - Cautery
-  - Drill
-  - Saw
-  - Hemostat
-
-- type: technology
-  id: BiochemicalStasis
-  name: research-technology-biochemical-stasis
-  icon:
-    sprite: Structures/Machines/stasis_bed.rsi
-    state: icon
-  discipline: Biochemical
-  tier: 1
-  cost: 7500
-  recipeUnlocks:
-  - CryostasisBeaker
-  - StasisBedMachineCircuitboard
-  - SyringeCryostasis
-
-- type: technology
-  id: MechanizedTreatment
-  name: research-technology-mechanized-treatment
-  icon:
-    sprite: Mobs/Silicon/chassis.rsi
-    state: medical
-  discipline: Biochemical
-  tier: 1
-  cost: 7500
-  recipeUnlocks:
-  - BorgModuleDiagnosis
-  - BorgModuleDefibrillator
-
-# doesn't do anything right now
-#
-#- type: technology
-#  id: Virology
-#  name: research-technology-virology
-#  icon:
-#    sprite: Structures/Machines/diagnoser.rsi
-#    state: icon
-#  discipline: Biochemical
-#  tier: 1
-#  cost: 5000
-#  recipeUnlocks:
-#  - VaccinatorMachineCircuitboard
-#  - DiagnoserMachineCircuitboard
-
-# Tier 2
-
-- type: technology
-  id: Cryopod
-  name: research-technology-cryogenics
-  icon:
-    sprite: Structures/Machines/cryogenics.rsi
-    state: pod-on
-  discipline: Biochemical
-  tier: 2
-  cost: 7500
-  recipeUnlocks:
-  - CryoPodMachineCircuitboard
-
-- type: technology
-  id: Biofabrication
-  name: research-technology-biofabrication
-  icon:
-    sprite: Structures/Machines/biofabricator.rsi
-    state: icon
-  discipline: Biochemical
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - BiofabricatorMachineCircuitboard
-  - BiomassReclaimerMachineCircuitboard
-
-- type: technology
-  id: ChemicalDispensary
-  name: research-technology-chemical-dispensary
-  icon:
-    sprite: Structures/dispensers.rsi
-    state: industrial-working
-  discipline: Biochemical
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - ChemMasterMachineCircuitboard
-  - ChemDispenserMachineCircuitboard
-  - BorgModuleAdvancedTreatment
-  technologyPrerequisites:
-  - Chemistry
-
-# Tier 3
-
-- type: technology
-  id: BluespaceChemistry
-  name: research-technology-bluespace-chemistry
-  icon:
-    sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi
-    state: beakerbluespace
-  discipline: Biochemical
-  tier: 3
-  cost: 10000
-  recipeUnlocks:
-  - BluespaceBeaker
-  - SyringeBluespace
-
-# look into revisiting this later once medical isn't a hellhole
-#- type: technology
-#  id: Cloning
-#  name: research-technology-cloning
-#  icon:
-#    sprite: Structures/Machines/cloning.rsi
-#    state: pod_0
-#  discipline: Biochemical
-#  tier: 3
-#  cost: 15000
-#  recipeUnlocks:
-#  - CloningPodMachineCircuitboard
-#  - MedicalScannerMachineCircuitboard
-#  - CloningConsoleComputerCircuitboard
-#  - BiomassReclaimerMachineCircuitboard

diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index ffb6383d79b532fbbb9d4cddddac5b7c7b436e12..8b5ee1a39abbde96a6f79ab3171bdf33caabe2c1 100644 (file)
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -107,9 +107,11 @@
     state: display
   discipline: CivilianServices
   tier: 1
-  cost: 5000
+  cost: 7500
   recipeUnlocks:
   - FatExtractorMachineCircuitboard
+  - BiofabricatorMachineCircuitboard
+  - BiomassReclaimerMachineCircuitboard
 
 # Tier 2
 
@@ -126,6 +128,35 @@
   - FauxTileAstroGrass
   - FauxTileAstroIce
 
+- type: technology
+  id: BiochemicalStasis
+  name: research-technology-biochemical-stasis
+  icon:
+    sprite: Structures/Machines/stasis_bed.rsi
+    state: icon
+  discipline: CivilianServices
+  tier: 2
+  cost: 7500
+  recipeUnlocks:
+  - StasisBedMachineCircuitboard
+  - CryoPodMachineCircuitboard
+  - CryostasisBeaker
+  - SyringeCryostasis
+
+- type: technology
+  id: MechanizedTreatment
+  name: research-technology-mechanized-treatment
+  icon:
+    sprite: Mobs/Silicon/chassis.rsi
+    state: medical
+  discipline: CivilianServices
+  tier: 2
+  cost: 7500
+  recipeUnlocks:
+  - BorgModuleAdvancedTreatment
+  - BorgModuleDiagnosis
+  - BorgModuleDefibrillator
+
 - type: technology
   id: AdvancedCleaning
   name: research-technology-advanced-cleaning
@@ -197,3 +228,16 @@
   cost: 10000
   recipeUnlocks:
   - ClothingShoesBootsSpeed
+
+- type: technology
+  id: BluespaceChemistry
+  name: research-technology-bluespace-chemistry
+  icon:
+    sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi
+    state: beakerbluespace
+  discipline: CivilianServices
+  tier: 3
+  cost: 10000
+  recipeUnlocks:
+  - BluespaceBeaker
+  - SyringeBluespace

diff --git a/Resources/Prototypes/Research/disciplines.yml b/Resources/Prototypes/Research/disciplines.yml
index 7ce290d23cba2e7ee653ef2c10ffe414ee0355f1..7a661da1a33663fe8c28b51b6ceb0d3a09f08dc0 100644 (file)
--- a/Resources/Prototypes/Research/disciplines.yml
+++ b/Resources/Prototypes/Research/disciplines.yml
@@ -10,18 +10,6 @@
     2: 0.75
     3: 0.75
 
-- type: techDiscipline
-  id: Biochemical
-  name: research-discipline-biochemical
-  color: "#449ae6"
-  icon:
-    sprite: Interface/Misc/research_disciplines.rsi
-    state: biochemical
-  tierPrerequisites:
-    1: 0
-    2: 0.75
-    3: 0.75
-
 - type: techDiscipline
   id: Arsenal
   name: research-discipline-arsenal