Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate Civilian Research #1603

Merged
merged 5 commits into from
Jan 19, 2025
Merged

Consolidate Civilian Research #1603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dfb9a0d
aaaaaaaa
VMSolidus Jan 19, 2025
d3f3a51
Merge branch 'Simple-Station:master' into Consolidate-Civilian-Research
VMSolidus Jan 19, 2025
32fe4fb
aaaaaaaa
VMSolidus Jan 19, 2025
a67eadd
Consolidate Civilian Research
VMSolidus Jan 19, 2025
230c82c
Merge branch 'master' into Consolidate-Civilian-Research
VMSolidus Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions Resources/Locale/en-US/research/technologies.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,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
37 changes: 19 additions & 18 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,19 @@
- WeaponCapacitorRechargerCircuitboard
- HandheldStationMap
- ClothingHeadHatWelding
- FauxTileAstroGrass
- FauxTileMowedAstroGrass
- FauxTileJungleAstroGrass
- FauxTileAstroIce
- FauxTileAstroSnow
- CanilunztTranslator
- BubblishTranslator
- NekomimeticTranslator
- DraconicTranslator
- SolCommonTranslator
- RootSpeakTranslator
- BasicGalaticCommonTranslatorImplanter
- MofficTranslator
- type: EmagLatheRecipes
emagStaticRecipes:
- BoxLethalshot
Expand Down Expand Up @@ -327,6 +340,7 @@
- ClothingShoesBootsMagSci
- ClothingShoesBootsMoon
- ClothingShoesBootsSpeed
- ClothingShoesBootsMagAdv
- NodeScanner
- HolofanProjector
- BluespaceBeaker
Expand All @@ -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
Expand All @@ -366,7 +368,6 @@
- RootSpeakTranslatorImplanter
- AnimalTranslator
- MofficTranslatorImplanter
- MofficTranslator
- ClothingEyesNightVisionGoggles
- ClothingEyesNightVisionDiagnosticGoggles
- ClothingEyesThermalVisionGoggles
Expand Down Expand Up @@ -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
Expand All @@ -498,7 +503,6 @@
- JukeboxCircuitBoard
- SurveillanceWirelessCameraMovableCircuitboard
- SurveillanceWirelessCameraAnchoredCircuitboard
- HydroponicsTrayMachineCircuitboard
- SolarControlComputerCircuitboard
- SolarTrackerElectronics
- TurboItemRechargerCircuitboard
Expand All @@ -515,7 +519,6 @@
- TechDiskComputerCircuitboard
- DawInstrumentMachineCircuitboard
- CloningConsoleComputerCircuitboard
- StasisBedMachineCircuitboard
- OreProcessorIndustrialMachineCircuitboard
- CargoTelepadMachineCircuitboard
- RipleyCentralElectronics
Expand All @@ -538,7 +541,6 @@
- MiniGravityGeneratorCircuitboard
- ShuttleGunKineticCircuitboard
- GasRecyclerMachineCircuitboard
- SeedExtractorMachineCircuitboard
- AnalysisComputerCircuitboard
- ExosuitFabricatorMachineCircuitboard
- AnomalyVesselCircuitboard
Expand All @@ -549,7 +551,6 @@
- ArtifactCrusherMachineCircuitboard
- TelecomServerCircuitboard
- MassMediaCircuitboard
- ReagentGrinderIndustrialMachineCircuitboard
- ReverseEngineeringMachineCircuitboard
- CrewMonitoringComputerCircuitboard
- DoorElectronics
Expand Down
Loading
Loading