From dfb9a0d26a2d51da02bf1b0b90023d2c6f30eabf Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 19 Jan 2025 15:20:05 -0500 Subject: [PATCH 1/3] aaaaaaaa --- .../Entities/Structures/Machines/lathe.yml | 37 +-- .../Prototypes/Research/civilianservices.yml | 232 ++++++------------ .../Prototypes/Research/experimental.yml | 17 -- 3 files changed, 93 insertions(+), 193 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 02169f6223a..38799d5cc07 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -196,6 +196,19 @@ - WeaponCapacitorRechargerCircuitboard - HandheldStationMap - ClothingHeadHatWelding + - FauxTileAstroGrass + - FauxTileMowedAstroGrass + - FauxTileJungleAstroGrass + - FauxTileAstroIce + - FauxTileAstroSnow + - CanilunztTranslator + - BubblishTranslator + - NekomimeticTranslator + - DraconicTranslator + - SolCommonTranslator + - RootSpeakTranslator + - BasicGalaticCommonTranslatorImplanter + - MofficTranslator - type: EmagLatheRecipes emagStaticRecipes: - BoxLethalshot @@ -327,6 +340,7 @@ - ClothingShoesBootsMagSci - ClothingShoesBootsMoon - ClothingShoesBootsSpeed + - ClothingShoesBootsMagAdv - NodeScanner - HolofanProjector - BluespaceBeaker @@ -342,21 +356,9 @@ - WelderExperimental - JawsOfLife - CoreSilver # Nyanotrasen - Silver Golem core - - FauxTileAstroGrass - - FauxTileMowedAstroGrass - - FauxTileJungleAstroGrass - - FauxTileAstroIce - - FauxTileAstroSnow - OreBagOfHolding - DeviceQuantumSpinInverter - - CanilunztTranslator - - BubblishTranslator - - NekomimeticTranslator - - DraconicTranslator - - SolCommonTranslator - - RootSpeakTranslator - XenoTranslator - - BasicGalaticCommonTranslatorImplanter - AdvancedGalaticCommonTranslatorImplanter - BubblishTranslatorImplanter - NekomimeticTranslatorImplanter @@ -366,7 +368,6 @@ - RootSpeakTranslatorImplanter - AnimalTranslator - MofficTranslatorImplanter - - MofficTranslator - ClothingEyesNightVisionGoggles - ClothingEyesNightVisionDiagnosticGoggles - ClothingEyesThermalVisionGoggles @@ -479,13 +480,17 @@ - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board - SpaceHeaterMachineCircuitBoard - StationAnchorCircuitboard + - SeedExtractorMachineCircuitboard + - HydroponicsTrayMachineCircuitboard + - ReagentGrinderIndustrialMachineCircuitboard + - StasisBedMachineCircuitboard + - CryoPodMachineCircuitboard dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard - PortableScrubberMachineCircuitBoard - CloningPodMachineCircuitboard - MedicalScannerMachineCircuitboard - - CryoPodMachineCircuitboard - VaccinatorMachineCircuitboard - DiagnoserMachineCircuitboard - BiomassReclaimerMachineCircuitboard @@ -498,7 +503,6 @@ - JukeboxCircuitBoard - SurveillanceWirelessCameraMovableCircuitboard - SurveillanceWirelessCameraAnchoredCircuitboard - - HydroponicsTrayMachineCircuitboard - SolarControlComputerCircuitboard - SolarTrackerElectronics - TurboItemRechargerCircuitboard @@ -515,7 +519,6 @@ - TechDiskComputerCircuitboard - DawInstrumentMachineCircuitboard - CloningConsoleComputerCircuitboard - - StasisBedMachineCircuitboard - OreProcessorIndustrialMachineCircuitboard - CargoTelepadMachineCircuitboard - RipleyCentralElectronics @@ -538,7 +541,6 @@ - MiniGravityGeneratorCircuitboard - ShuttleGunKineticCircuitboard - GasRecyclerMachineCircuitboard - - SeedExtractorMachineCircuitboard - AnalysisComputerCircuitboard - ExosuitFabricatorMachineCircuitboard - AnomalyVesselCircuitboard @@ -549,7 +551,6 @@ - ArtifactCrusherMachineCircuitboard - TelecomServerCircuitboard - MassMediaCircuitboard - - ReagentGrinderIndustrialMachineCircuitboard - ReverseEngineeringMachineCircuitboard - CrewMonitoringComputerCircuitboard - DoorElectronics diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index f785443dcad..346e2e5d4de 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -1,31 +1,20 @@ # Tier 1 - - type: technology - id: Hydroponics - name: research-technology-basic-hydroponics + id: BasicCybernetics + name: research-technology-basic-cybernetics icon: - sprite: Structures/Machines/seed_extractor.rsi - state: seedextractor + sprite: Mobs/Silicon/chassis.rsi + state: robot discipline: CivilianServices tier: 1 - cost: 5000 + cost: 15000 recipeUnlocks: + - BorgModuleLightReplacer + - BorgModuleAdvancedCleaning - BorgModuleGardening - BorgModuleHarvesting - - SeedExtractorMachineCircuitboard - - HydroponicsTrayMachineCircuitboard - - ReagentGrinderIndustrialMachineCircuitboard - -- type: technology - id: CritterMechs - name: research-technology-critter-mechs - icon: - sprite: Objects/Specific/Mech/mecha.rsi - state: hamtr - discipline: CivilianServices - tier: 1 - cost: 7500 - recipeUnlocks: + - BorgModuleMusique + - BorgModuleClowning - HamtrHarness - HamtrLArm - HamtrRArm @@ -35,16 +24,20 @@ - HamtrPeripheralsElectronics - MechEquipmentGrabberSmall - VimHarness + - ProximitySensor + - ExosuitFabricatorMachineCircuitboard + - BorgModuleArtifact + - BorgModuleAnomaly - type: technology - id: AudioVisualCommunication + id: BasicElectronics name: research-technology-audio-visual-communication icon: - sprite: Structures/Wallmounts/camera.rsi - state: cameracase + sprite: Structures/Machines/computers.rsi + state: television discipline: CivilianServices tier: 1 - cost: 5000 + cost: 10000 recipeUnlocks: - SurveillanceCameraRouterCircuitboard - SurveillanceCameraWirelessRouterCircuitboard @@ -53,97 +46,62 @@ - SurveillanceCameraMonitorCircuitboard - SurveillanceWirelessCameraMonitorCircuitboard - TelecomServerCircuitboard - -- type: technology - id: AdvancedEntertainment - name: research-technology-advanced-entertainment - icon: - sprite: Structures/Machines/computers.rsi - state: television - discipline: CivilianServices - tier: 1 - cost: 7500 - recipeUnlocks: - - ComputerTelevisionCircuitboard - - SynthesizerInstrument - - BorgModuleMusique - - BorgModuleClowning - - DawInstrumentMachineCircuitboard - - MassMediaCircuitboard - - JukeboxCircuitBoard - -- type: technology - id: RoboticCleanliness - name: research-technology-robotic-cleanliness - icon: - sprite: Mobs/Silicon/chassis.rsi - state: janitor - discipline: CivilianServices - tier: 1 - cost: 5000 - recipeUnlocks: - - BorgModuleLightReplacer - - BorgModuleAdvancedCleaning - -- type: technology - id: MeatManipulation - name: research-technology-meat-manipulation - icon: - sprite: Structures/Machines/fat_sucker.rsi - state: display - discipline: CivilianServices - tier: 1 - cost: 7500 - recipeUnlocks: + - ComputerTelevisionCircuitboard + - SynthesizerInstrument + - DawInstrumentMachineCircuitboard + - MassMediaCircuitboard + - JukeboxCircuitBoard - FatExtractorMachineCircuitboard - BiofabricatorMachineCircuitboard - BiomassReclaimerMachineCircuitboard +# TODO: Add recipes to manufacture Vacsuits. +# - type: technology +# id: BasicVacsuits +# name: research-technology-basic-vacsuits +# icon: +# sprite: Clothing/OuterClothing/Suits/eva_emergency.rsi +# state: icon +# discipline: CivilianServices +# tier: 1 +# cost: 10000 +# recipeUnlocks: +# - ClothingOuterSuitEmergency + # Tier 2 -- type: technology - id: FauxAstroTiles - name: research-technology-faux-astro-tiles - icon: - sprite: Objects/Tiles/tile.rsi - state: astroice - discipline: CivilianServices - tier: 2 - cost: 5000 - recipeUnlocks: - - FauxTileAstroGrass - - FauxTileMowedAstroGrass - - FauxTileJungleAstroGrass - - FauxTileAstroIce - - FauxTileAstroSnow +# TODO: Add recipes to manufacture Hardsuits +# - type: technology +# id: BasicHardsuits +# name: research-technology-basic-hardsuits +# icon: +# sprite: Clothing/OuterClothing/Hardsuits/engineering.rsi +# state: icon +# discipline: CivilianServices +# tier: 1 +# cost: 15000 +# recipeUnlocks: +# - ClothingOuterHardsuitEngineering - type: technology - id: BiochemicalStasis - name: research-technology-biochemical-stasis + id: BasicLifeImprovements + name: research-technology-basic-life-improvements icon: sprite: Structures/Machines/stasis_bed.rsi state: icon discipline: CivilianServices tier: 2 - cost: 7500 + cost: 15000 recipeUnlocks: - - StasisBedMachineCircuitboard - - CryoPodMachineCircuitboard - CryostasisBeaker - SyringeCryostasis - -- type: technology - id: AdvancedCleaning - name: research-technology-advanced-cleaning - icon: - sprite: Objects/Specific/Janitorial/advmop.rsi - state: advmop - discipline: CivilianServices - tier: 2 - cost: 10000 - recipeUnlocks: - AdvMopItem - MegaSprayBottle + - WeaponSprayNozzle + - ClothingBackpackWaterTank + - CargoTelepadMachineCircuitboard + - ClothingShoesBootsMagSci + - ClothingShoesBootsMoon - type: technology id: HONKMech @@ -165,77 +123,35 @@ - HonkerTargetingElectronics - MechEquipmentHorn -- type: technology - id: AdvancedSpray - name: research-technology-advanced-spray - icon: - sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi - state: icon - discipline: CivilianServices - tier: 2 - cost: 10000 - recipeUnlocks: - - WeaponSprayNozzle - - ClothingBackpackWaterTank - -- type: technology - id: BluespaceCargoTransport - name: research-technology-bluespace-cargo-transport - icon: - sprite: Structures/cargo_telepad.rsi - state: display - discipline: CivilianServices - tier: 2 - cost: 15000 - recipeUnlocks: - - CargoTelepadMachineCircuitboard - # Tier 3 - -- type: technology - id: QuantumFiberWeaving - name: research-technology-quantum-fiber-weaving +# TODO: Add recipes to manufacture Advanced Hardsuits +# - type: technology +# id: BasicHardsuits +# name: research-technology-basic-hardsuits +# icon: +# sprite: Clothing/OuterClothing/Hardsuits/engineering-white.rsi +# state: icon +# discipline: CivilianServices +# tier: 1 +# cost: 15000 +# recipeUnlocks: +# - ClothingOuterHardsuitEngineeringWhite + +- type: technology + id: AdvancedLifeImprovements + name: research-technology-advanced-life-improvements icon: sprite: Clothing/Shoes/Boots/speedboots.rsi state: icon discipline: CivilianServices - tier: 3 - cost: 10000 + tier: 2 + cost: 15000 recipeUnlocks: + - ClothingShoesBootsMagAdv - 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 -- type: technology - id: BasicTranslation - name: research-technology-basic-translation - icon: - sprite: Objects/Devices/translator.rsi - state: icon - discipline: CivilianServices - tier: 2 - cost: 10000 - recipeUnlocks: - - CanilunztTranslator - - BubblishTranslator - - NekomimeticTranslator - - DraconicTranslator - - SolCommonTranslator - - RootSpeakTranslator - - BasicGalaticCommonTranslatorImplanter - - MofficTranslator - - type: technology id: AdvancedTranslation name: research-technology-advanced-translation diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index cf6493847ac..e299cf6fd95 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -1,18 +1,5 @@ # Tier 1 -- type: technology - id: BasicRobotics - name: research-technology-basic-robotics - icon: - sprite: Structures/Machines/exosuit_fabricator.rsi - state: fab-idle - discipline: Experimental - tier: 1 - cost: 5000 - recipeUnlocks: - - ProximitySensor - - ExosuitFabricatorMachineCircuitboard - - type: technology id: BasicAnomalousResearch name: research-technology-basic-anomalous-research @@ -26,7 +13,6 @@ - AnomalyScanner - AnomalyLocator - AnomalyLocatorWide - - BorgModuleAnomaly - APECircuitboard - AnomalyVesselCircuitboard @@ -41,7 +27,6 @@ cost: 5000 recipeUnlocks: - NodeScanner - - BorgModuleArtifact - AnalysisComputerCircuitboard - ArtifactAnalyzerMachineCircuitboard @@ -68,8 +53,6 @@ tier: 1 cost: 7500 recipeUnlocks: - - ClothingShoesBootsMagSci - - ClothingShoesBootsMoon - type: technology id: AnomalyCoreHarnessing From 32fe4fb5da096a5b53bdb7196f429c41aeddef92 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 19 Jan 2025 15:28:06 -0500 Subject: [PATCH 2/3] aaaaaaaa --- .../Prototypes/Research/civilianservices.yml | 12 ++-- .../Prototypes/Research/experimental.yml | 65 +------------------ 2 files changed, 11 insertions(+), 66 deletions(-) diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 346e2e5d4de..b50f91589f9 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -37,7 +37,7 @@ state: television discipline: CivilianServices tier: 1 - cost: 10000 + cost: 12500 recipeUnlocks: - SurveillanceCameraRouterCircuitboard - SurveillanceCameraWirelessRouterCircuitboard @@ -102,6 +102,9 @@ - CargoTelepadMachineCircuitboard - ClothingShoesBootsMagSci - ClothingShoesBootsMoon + - CloningConsoleComputerCircuitboard + - MedicalScannerMachineCircuitboard + - MetempsychoticMachineCircuitboard - type: technology id: HONKMech @@ -126,8 +129,8 @@ # Tier 3 # TODO: Add recipes to manufacture Advanced Hardsuits # - type: technology -# id: BasicHardsuits -# name: research-technology-basic-hardsuits +# id: AdvancedHardsuits +# name: research-technology-advanced-hardsuits # icon: # sprite: Clothing/OuterClothing/Hardsuits/engineering-white.rsi # state: icon @@ -147,10 +150,11 @@ tier: 2 cost: 15000 recipeUnlocks: - - ClothingShoesBootsMagAdv + - ClothingShoesBootsMagAdv # TODO: Separate this out from the silly "Steal the CE's Timbs" objective - ClothingShoesBootsSpeed - BluespaceBeaker - SyringeBluespace + # TODO: Add things like frontier's Hyposprays. - type: technology id: AdvancedTranslation diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index e299cf6fd95..59a85624ed3 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -29,30 +29,8 @@ - NodeScanner - AnalysisComputerCircuitboard - ArtifactAnalyzerMachineCircuitboard - -- type: technology - id: AlternativeResearch - name: research-technology-alternative-research - icon: - sprite: Structures/Machines/tech_disk_printer.rsi - state: display - discipline: Experimental - tier: 1 - cost: 5000 - recipeUnlocks: - TechDiskComputerCircuitboard - - ReverseEngineeringMachineCircuitboard #DeltaV - -- type: technology - id: MagnetsTech - name: research-technology-magnets-tech - icon: - sprite: Clothing/Shoes/Boots/magboots-science.rsi - state: icon - discipline: Experimental - tier: 1 - cost: 7500 - recipeUnlocks: + - ReverseEngineeringMachineCircuitboard - type: technology id: AnomalyCoreHarnessing @@ -81,18 +59,7 @@ - AdvancedCapacitorStockPart - AdvancedMatterBinStockPart - NanoManipulatorStockPart - -- type: technology - id: AbnormalArtifactManipulation - name: research-technology-abnormal-artifact-manipulation - icon: - sprite: Structures/Machines/artifact_crusher.rsi - state: icon - discipline: Experimental - tier: 2 - cost: 5000 - recipeUnlocks: - - ArtifactCrusherMachineCircuitboard + - RPED - type: technology id: AdvancedAnomalyResearch @@ -107,21 +74,10 @@ - WeaponPistolCHIMP - AnomalySynchronizerCircuitboard - AnomalyVesselExperimentalCircuitboard + - ArtifactCrusherMachineCircuitboard technologyPrerequisites: - BasicAnomalousResearch -- type: technology - id: RapidPartExchange - name: research-technology-rped - icon: - sprite: Objects/Specific/Research/rped.rsi - state: icon - discipline: Experimental - tier: 2 - cost: 7500 - recipeUnlocks: - - RPED - - type: technology id: DeterrenceTechnologies name: research-technology-deterrence @@ -135,21 +91,6 @@ - WeaponParticleDecelerator - HoloprojectorField -- type: technology - id: Metempsychosis - name: research-technology-metempsychosis - icon: - sprite: Structures/Machines/metempsychotic.rsi - state: cloning_idle - discipline: Experimental - tier: 2 - cost: 15000 - recipeUnlocks: - - BiomassReclaimerMachineCircuitboard - - CloningConsoleComputerCircuitboard - - MedicalScannerMachineCircuitboard - - MetempsychoticMachineCircuitboard - - type: technology id: NightVisionTech name: research-technology-night-vision From a67eadd472df4ca3c14eb9cfd2c762ab2be3538d Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 19 Jan 2025 15:32:24 -0500 Subject: [PATCH 3/3] Consolidate Civilian Research --- .../Locale/en-US/research/technologies.ftl | 21 ++++--------------- .../Prototypes/Research/civilianservices.yml | 2 +- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 88cd0be3974..6c463864784 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -56,21 +56,8 @@ research-technology-deterrence = Deterrence Technologies research-technology-night-vision = Night vision research-technology-thermal-vision = Thermal vision -research-technology-janitorial-equipment = Janitorial Equipment -research-technology-laundry-tech = Laundry Tech -research-technology-basic-hydroponics = Basic Hydroponics -research-technology-critter-mechs = Critter Mechs -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 +research-technology-basic-cybernetics = Basic Cybernetics +research-technology-basic-electronics = Basic Electronics +research-technology-basic-life-improvements = Basic Life Improvements 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 +research-technology-advanced-life-improvements = Advanced Life Improvements diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index b50f91589f9..c95f4112544 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -31,7 +31,7 @@ - type: technology id: BasicElectronics - name: research-technology-audio-visual-communication + name: research-technology-basic-electronics icon: sprite: Structures/Machines/computers.rsi state: television