Tech Tree 2 Deluxe (With Funky Kong) (#12916)

Closes https://github.com/space-wizards/space-station-14/issues/12147

Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl

@@ -10,6 +10,9 @@ technologies-biological-technology-description = Investigations into the natural
 technologies-advanced-botany = Advanced botany
 technologies-advanced-botany-description = A better understanding of botany.
 
+technologies-virology = Virology
+technologies-virology-description = The secrets of the immune system.
+
 technologies-advanced-surgery = Advanced surgery
 technologies-advanced-surgery-description = Research new surgical procedures.
 
@@ -22,21 +25,33 @@ technologies-medical-machinery-description = Machines any self-respecting medbay
 technologies-advanced-life-support = Advanced life support systems
 technologies-advanced-life-support-description = The cutting edge of life and death.
 
+technologies-salvage-equipment = Salvage equipment
+technologies-salvage-equipment-description = Newer and faster resource collection.
+
+technologies-spacefaring = Spacefaring technology
+technologies-spacefaring-description = Able to bring you into the stars!
+
+technologies-surveillance = Surveillance technology
+technologies-surveillance-description = Retro-styled cameras straight from the year 1984!
+
 technologies-industrial-engineering = Industrial engineering
 technologies-industrial-engineering-description = A refresher course on modern engineering technology.
 
+technologies-rapid-upgrade = Rapid upgrade
+technologies-rapid-upgrade-description = The ability to quickly upgrade the station like never before.
+
 technologies-material-sheet-printing = Material sheet printing
 technologies-material-sheet-printing-description = Print those sheets!
 
-technologies-advanced-atmospherics-technology = Advanced atmospherics technology
-technologies-advanced-atmospherics-technology-description = As if it can get more advanced.
-
-technologies-avionics-systems = Avionics systems
-technologies-avionics-systems-description = The latest in fly-by-LV-wire technology
-
 technologies-electromagnetic-theory = Electromagnetic theory
 technologies-electromagnetic-theory-description = Try not to fry yourself.
 
+technologies-electrical-engineering = Electrical engineering
+technologies-electrical-engineering-description = Machinery used to keep the station stable.
+
+technologies-advanced-atmospherics-technology = Advanced atmospherics technology
+technologies-advanced-atmospherics-technology-description = As if it can get more advanced.
+
 technologies-compact-power-technology = Compact power technology
 technologies-compact-power-technology-description = Power, but smaller.
 
@@ -52,11 +67,14 @@ technologies-advanced-powercell-printing-description = Print advanced powercells
 technologies-super-powercell-printing = Super powercell printing
 technologies-super-powercell-printing-description = Print super powercells.
 
-technologies-basic-parts-technology = Basic parts technology
+technologies-scientific-technology = Scientific technology
-technologies-basic-parts-technology-description = They aren't great, but at least they're something.
+technologies-scientific-technology-description = The basics of a research team's supplies.
-
-technologies-adv-parts-technology = Advanced parts technology
-technologies-adv-parts-technology-description = Good for upgrading machines.
 
 technologies-robotics-technology = Robotics technology
-technologies-robotics-technology-description = Robot parts.
+technologies-robotics-technology-description = Parts needed for constructing mechanized friends.
+
+technologies-archaeology = Archeological equipment
+technologies-archaeology-description = Advanced equipment for uncovering the secrets of artifacts.
+
+technologies-adv-parts-technology = Advanced parts technology
+technologies-adv-parts-technology-description = Like the previous ones, but better!

Resources/Prototypes/Catalog/Research/technologies.yml

@@ -1,5 +1,5 @@
-# In order to make this list somewhat organized, please place new technologies underneath their overarching "base" technology.
+# In order to make this list somewhat organized, please place 
-# The technology tree is using this layout - https://tgstation13.org/wiki//images/thumb/f/f4/ResearchTree.png/800px-ResearchTree.png
+# new technologies underneath their overarching "base" technology.
 
 # Base Technology
 
@@ -45,13 +45,10 @@
   unlockedRecipes:
   - HydroponicsToolScythe
   - HydroponicsToolHatchet
+  - Shovel
+  - ButchCleaver
   - KitchenKnife
-    - HandheldHealthAnalyzer
+  - MicrowaveMachineCircuitboard
-    - ClothingHandsGlovesLatex
-    - ClothingHandsGlovesNitrile
-    - ClothingMaskSterile
-    - DiseaseSwab
-    - Implanter
 
 - type: technology
   name: technologies-advanced-botany
@@ -64,30 +61,30 @@
   requiredTechnologies:
   - BiologicalTechnology
   unlockedRecipes:
-    - Shovel
-    - ButchCleaver
-    - MicrowaveMachineCircuitboard
   - SeedExtractorMachineCircuitboard
+  - HydroponicsTrayMachineCircuitboard
+  - HandheldHealthAnalyzer
+  - Implanter
 
 - type: technology
-  name: technologies-advanced-surgery
+  name: technologies-virology
-  id: AdvancedSugery
+  id: Virology
-  description: technologies-advanced-surgery-description
+  description: technologies-virology-description
   icon:
-    sprite: Objects/Specific/Medical/Surgery/saw.rsi
+    sprite: Clothing/Mask/sterile.rsi
-    state: saw
+    state: icon
-  requiredPoints: 15000
+  requiredPoints: 10000
   requiredTechnologies:
   - BiologicalTechnology
   unlockedRecipes:
-    - Scalpel
+  - ClothingHandsGlovesLatex
-    - Retractor
+  - ClothingHandsGlovesNitrile
-    - Cautery
+  - ClothingMaskSterile
-    - Drill
+  - DiseaseSwab
-    - Saw
+  - VaccinatorMachineCircuitboard
-    - Hemostat
+  - DiagnoserMachineCircuitboard
 
-# Chemistry Technology Tree
+# Medical Technology Tree
 
 - type: technology
   name: technologies-chemistry-technology
@@ -108,9 +105,26 @@
   - ReagentGrinderMachineCircuitboard
   - PillCanister
   - ChemistryEmptyBottle01
-    - TimerTrigger
   - ChemicalPayload
 
+- type: technology
+  name: technologies-advanced-surgery
+  id: AdvancedSugery
+  description: technologies-advanced-surgery-description
+  icon:
+    sprite: Objects/Specific/Medical/Surgery/saw.rsi
+    state: saw
+  requiredPoints: 7500
+  requiredTechnologies:
+  - BiologicalTechnology
+  unlockedRecipes:
+  - Scalpel
+  - Retractor
+  - Cautery
+  - Drill
+  - Saw
+  - Hemostat
+
 - type: technology
   name: technologies-medical-machinery
   id: MedicalMachinery
@@ -126,8 +140,6 @@
   - ChemMasterMachineCircuitboard
   - ChemDispenserMachineCircuitboard
   - CrewMonitoringComputerCircuitboard
-    - VaccinatorMachineCircuitboard
-    - DiagnoserMachineCircuitboard
   - HandheldCrewMonitor
   - BiomassReclaimerMachineCircuitboard
 
@@ -141,7 +153,7 @@
   requiredPoints: 20000
   requiredTechnologies:
   - MedicalMachinery
-    - AdvancedSugery
+  - Virology
   unlockedRecipes:
   - CloningPodMachineCircuitboard
   - MedicalScannerMachineCircuitboard
@@ -150,8 +162,24 @@
 
 # Security Technology Tree
 
-# Empty, as all the security tech is now available
+- type: technology
-# roundstart in the security techfab.
+  name: technologies-surveillance
+  id: SurveillanceTechnology
+  description: technologies-surveillance-description
+  icon:
+    sprite: Structures/Wallmounts/camera.rsi
+    state: cameracase
+  requiredPoints: 12500
+  requiredTechnologies:
+  - BasicResearch
+  unlockedRecipes:
+  - SurveillanceCameraRouterCircuitboard
+  - SurveillanceCameraWirelessRouterCircuitboard
+  - SurveillanceWirelessCameraMovableCircuitboard
+  - SurveillanceWirelessCameraAnchoredCircuitboard
+  - SurveillanceCameraMonitorCircuitboard
+  - SurveillanceWirelessCameraMonitorCircuitboard
+  - ComputerTelevisionCircuitboard
 
 #- type: technology
 #   name: "ballistic technology"
@@ -197,18 +225,39 @@
 #   requiredTechnologies:
 #     - SecurityTechnology
 
-# Data Theory Technology Tree
+# Salvage Technology Tree
 
-# - type: technology
+- type: technology
-#   name: "data theory"
+  name: technologies-salvage-equipment
-#   id: DataTheory
+  id: SalvageEquipment
-#   description: Just like regular data, but in space!
+  description: technologies-salvage-equipment-description
-#   icon:
+  icon:
-#     sprite: Structures/Machines/computers.rsi
+    sprite: Objects/Tools/handdrill.rsi
-#     state: computer-datatheory
+    state: handdrill
-#   requiredPoints: 10000
+  requiredPoints: 7500
-#   requiredTechnologies:
+  requiredTechnologies:
-#     - BasicResearch
+  - BasicResearch
+  unlockedRecipes:
+  - AppraisalTool
+#TODO- MiningDrill
+  - OreProcessorMachineCircuitboard
+
+- type: technology
+  name: technologies-spacefaring
+  id: SpacefaringTechnology
+  description: technologies-spacefaring-description
+  icon:
+    sprite: Structures/Shuttles/gyroscope.rsi
+    state: base
+  requiredPoints: 10000
+  requiredTechnologies:
+  - SalvageEquipment
+  - IndustrialEngineering
+  unlockedRecipes:
+  - ShuttleConsoleCircuitboard
+  - RadarConsoleCircuitboard
+#TODO- Gyroscope
+#TODO- Thruster
 
 # Industrial Engineering Technology Tree
 
@@ -223,37 +272,25 @@
   requiredTechnologies:
   - BasicResearch
   unlockedRecipes:
-    - AppraisalTool
   - ConveyorBeltAssembly
-    - RCD
-    - RCDAmmo
   - FlashlightLantern
   - FireExtinguisher
+  - FirelockElectronics
+  - DoorElectronics
   - AutolatheMachineCircuitboard
-    - EmitterCircuitboard
   - ProtolatheMachineCircuitboard
-    - OreProcessorMachineCircuitboard
   - CircuitImprinterMachineCircuitboard
   - UniformPrinterMachineCircuitboard
-    - SurveillanceCameraRouterCircuitboard
-    - SurveillanceCameraWirelessRouterCircuitboard
-    - SurveillanceWirelessCameraMovableCircuitboard
-    - SurveillanceWirelessCameraAnchoredCircuitboard
-    - SurveillanceCameraMonitorCircuitboard
-    - SurveillanceWirelessCameraMonitorCircuitboard
-    - ComputerTelevisionCircuitboard
   - AirAlarmElectronics
   - FireAlarmElectronics
   - MailingUnitElectronics
-    - HolofanProjector
-    - RPED
 
 - type: technology
   name: technologies-material-sheet-printing
   id: Sheets
   description: technologies-material-sheet-printing-description
   icon: Objects/Materials/Sheets/researchicon.png
-  requiredPoints: 2500
+  requiredPoints: 5000
   requiredTechnologies:
   - IndustrialEngineering
   unlockedRecipes:
@@ -262,39 +299,6 @@
   - SheetRGlass
   - SheetGlass1
 
-- type: technology
-  name: technologies-advanced-atmospherics-technology
-  id: AdvancedAtmosTechnology
-  description: technologies-advanced-atmospherics-technology-description
-  icon:
-    sprite: Structures/Piping/Atmospherics/thermomachine.rsi
-    state: freezer_off
-  requiredPoints: 3000
-  requiredTechnologies:
-  - IndustrialEngineering
-  unlockedRecipes:
-  - ThermomachineFreezerMachineCircuitBoard
-  - PortableScrubberMachineCircuitBoard
-  - GasRecyclerMachineCircuitboard
-
-# Avionics Circuitry Technology Tree
-
-- type: technology
-  name: technologies-avionics-systems
-  id: AvionicsSystems
-  description: technologies-avionics-systems-description
-  icon:
-    sprite: Structures/Machines/computers.rsi
-    state: avionics-systems
-  requiredPoints: 10000
-  requiredTechnologies:
-    - IndustrialEngineering
-    - RoboticsTechnology
-  unlockedRecipes:
-    - ShuttleConsoleCircuitboard
-    - Drone
-    - RadarConsoleCircuitboard
-
 # Electromagnetic Theory Technology Tree
 
 - type: technology
@@ -313,28 +317,70 @@
   - CableHVStack
   - LightBulb
   - LightTube
-    - FirelockElectronics
-    - DoorElectronics
   - APCElectronics
-    - SMESMachineCircuitboard
   - SubstationMachineCircuitboard
-    - HydroponicsTrayMachineCircuitboard
-    - SolarControlComputerCircuitboard
-    - PowerComputerCircuitboard
-    - GeneratorPlasmaMachineCircuitboard
-    - AnalysisComputerCircuitboard
-    - ArtifactAnalyzerMachineCircuitboard
   - Signaller
   - SignalTrigger
   - VoiceTrigger
+  - TimerTrigger
+
+- type: technology
+  name: technologies-electrical-engineering
+  id: ElectricalEngineering
+  description: technologies-electrical-engineering-description
+  icon:
+    sprite: Structures/Power/Generation/Singularity/emitter.rsi
+    state: emitter1
+  requiredPoints: 15000
+  requiredTechnologies:
+  - ElectromagneticTheory
+  - IndustrialEngineering
+  unlockedRecipes:
+  - RCD
+  - RCDAmmo
+  - SMESMachineCircuitboard
+  - PowerComputerCircuitboard
+  - GeneratorPlasmaMachineCircuitboard
+  - GeneratorUraniumMachineCircuitboard
+  - SolarControlComputerCircuitboard
+  - EmitterCircuitboard
+
+- type: technology
+  name: technologies-advanced-atmospherics-technology
+  id: AdvancedAtmosTechnology
+  description: technologies-advanced-atmospherics-technology-description
+  icon:
+    sprite: Structures/Piping/Atmospherics/thermomachine.rsi
+    state: freezer_off
+  requiredPoints: 7500
+  requiredTechnologies:
+  - ElectricalEngineering
+  unlockedRecipes:
+  - HolofanProjector
+  - ThermomachineFreezerMachineCircuitBoard
+  - PortableScrubberMachineCircuitBoard
+  - GasRecyclerMachineCircuitboard
+
+- type: technology
+  name: technologies-rapid-upgrade
+  id: RapidUpgrade
+  description: technologies-rapid-upgrade-description
+  icon: 
+    sprite: Objects/Specific/Research/rped.rsi
+    state: icon
+  requiredPoints: 7500
+  requiredTechnologies:
+  - ElectricalEngineering
+  unlockedRecipes:
+  - RPED
 
 - type: technology
   name: technologies-compact-power-technology
   id: CompactPowerTechnology
   description: technologies-compact-power-technology-description
   icon:
-    sprite: Structures/Power/apc.rsi
+    sprite: Structures/Power/Generation/wallmount_generator.rsi
-    state: apc0
+    state: panel
   requiredPoints: 5000
   requiredTechnologies:
   - ElectromagneticTheory
@@ -342,21 +388,6 @@
   - WallmountSubstationElectronics
   - WallmountGeneratorElectronics
   - WallmountGeneratorAPUElectronics
-    - GeneratorUraniumMachineCircuitboard
-
-- type: technology
-  name: technologies-applied-musicology
-  id: AppliedMusicology
-  description: technologies-applied-musicology-description
-  icon:
-    sprite: Objects/Fun/Instruments/guitar.rsi
-    state: icon
-  requiredPoints: 10000
-  requiredTechnologies:
-    - ElectromagneticTheory
-  unlockedRecipes:
-    - SynthesizerInstrument
-    - DawInstrumentMachineCircuitboard
 
 - type: technology
   name: technologies-basic-powercell-printing
@@ -391,21 +422,38 @@
   icon:
     sprite: Objects/Power/power_cells.rsi
     state: high
-  requiredPoints: 10000
+  requiredPoints: 7500
   requiredTechnologies:
   - PowerCellAdvanced
   unlockedRecipes:
   - PowerCellHigh
-# Basic Parts Technology Tree
+
+# Entertainment Technology Tree
 
 - type: technology
-  name: technologies-basic-parts-technology
+  name: technologies-applied-musicology
-  id: BasicPartsTechnology
+  id: AppliedMusicology
-  description: technologies-basic-parts-technology-description
+  description: technologies-applied-musicology-description
+  icon:
+    sprite: Objects/Fun/Instruments/h_synthesizer.rsi
+    state: icon
+  requiredPoints: 5000
+  requiredTechnologies:
+  - BasicResearch
+  unlockedRecipes:
+  - SynthesizerInstrument
+  - DawInstrumentMachineCircuitboard
+
+# Science Technology Tree
+
+- type: technology
+  name: technologies-scientific-technology
+  id: ScientificTechnology
+  description: technologies-scientific-technology-description
   icon:
     sprite: Objects/Misc/stock_parts.rsi
     state: micro_mani
-  requiredPoints: 3000
+  requiredPoints: 5000
   requiredTechnologies:
   - BasicResearch
   unlockedRecipes:
@@ -422,14 +470,30 @@
   icon:
     sprite: Mobs/Silicon/Bots/honkbot.rsi
     state: honkbot
-  requiredPoints: 10000
+  requiredPoints: 7500
   requiredTechnologies:
-    - CompactPowerTechnology
+  - ScientificTechnology
   unlockedRecipes:
-    - ExosuitFabricatorMachineCircuitboard
   - ProximitySensor
   - LeftArmBorg
   - RightArmBorg
+  - Drone
+  - ExosuitFabricatorMachineCircuitboard
+
+- type: technology
+  name: technologies-archaeology
+  id: ArchaeologicalEquipment
+  description: technologies-archaeology-description
+  icon:
+    sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi
+    state: ano01
+  requiredPoints: 10000
+  requiredTechnologies:
+  - ScientificTechnology
+  unlockedRecipes:
+  - AnalysisComputerCircuitboard
+  - ArtifactAnalyzerMachineCircuitboard
+  - TraversalDistorterMachineCircuitboard
 
 - type: technology
   name: technologies-adv-parts-technology
@@ -438,27 +502,13 @@
   icon:
     sprite: Objects/Misc/stock_parts.rsi
     state: adv_capacitor
-  requiredPoints: 8000
+  requiredPoints: 15000
   requiredTechnologies:
-    - BasicPartsTechnology
+  - ScientificTechnology
-    - PowerCellBasic
+  - CompactPowerTechnology
   unlockedRecipes:
   - AdvancedCapacitorStockPart
   - AdvancedMatterBinStockPart
   - HighPowerMicroLaserStockPart
   - NanoManipulatorStockPart
   - AdvancedScanningModuleStockPart
-    - TraversalDistorterMachineCircuitboard #sigh
-
-# Bluespace Theory Technology Tree
-
-# - type: technology
-#   name: "basic bluespace theory"
-#   id: BluespaceTheory
-#   description: An experimental course on the mysterious technology known as bluespace.
-#   icon:
-#     sprite: Objects/Misc/skub.rsi
-#     state: icon
-#   requiredPoints: 999999
-#   requiredTechnologies:
-#     - BasicResearch

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -222,6 +222,7 @@
       - PowerCellSmall
       - PowerCellMedium
       - PowerCellHigh  
+      - SynthesizerInstrument
       - RPED
       - HolofanProjector