From 0d48777d7ca1e07e335fa232deb1312cb170368a Mon Sep 17 00:00:00 2001 From: Flopochka Date: Wed, 21 Aug 2024 21:00:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=81=D1=8F=D0=BA=D0=BE=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/research/technologies.ftl | 1 + .../Structures/piping/atmospherics/pipes.ftl | 10 +++++----- Resources/Locale/ru-RU/research/technologies.ftl | 1 + .../Structures/Piping/Atmospherics/pipes.yml | 10 +++++----- Resources/Prototypes/ADT/Recipes/Lathes/misc.yml | 7 +++++++ .../Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/Research/industrial.yml | 16 ++++++++++++++++ 7 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 Resources/Prototypes/ADT/Recipes/Lathes/misc.yml diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 70ca8d018ac..0ba9737cf20 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -15,6 +15,7 @@ research-technology-atmospheric-tech = Atmospherics research-technology-shuttlecraft = Shuttlecraft research-technology-ripley-aplu = Ripley APLU research-technology-advanced-atmospherics = Advanced Atmospherics +research-technology-compact-technologies = Matter compression technologies research-technology-advanced-tools = Advanced Tools research-technology-super-powercells = Super Powercells research-technology-bluespace-storage = Bluespace Storage diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/piping/atmospherics/pipes.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/piping/atmospherics/pipes.ftl index 999e73def44..bb72ac6da08 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/piping/atmospherics/pipes.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/piping/atmospherics/pipes.ftl @@ -1,15 +1,15 @@ ent-ADTGasPipeHalf = { ent-GasPipeBase } - .suffix = Половинная + .suffix = Половинная, ADT .desc = { ent-GasPipeBase.desc } ent-ADTGasPipeStraight = { ent-GasPipeBase } - .suffix = Прямая + .suffix = Прямая, ADT .desc = { ent-GasPipeBase.desc } ent-ADTGasPipeBend = { ent-GasPipeBase } - .suffix = Угловая + .suffix = Угловая, ADT .desc = { ent-GasPipeBase.desc } ent-ADTGasPipeTJunction = { ent-GasPipeBase } - .suffix = Т-образная + .suffix = Т-образная, ADT .desc = { ent-GasPipeBase.desc } ent-ADTGasPipeFourway = { ent-GasPipeBase } - .suffix = Четверная + .suffix = Четверная, ADT .desc = { ent-GasPipeBase.desc } diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index 5fbf5a748a1..a07dc972240 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -14,6 +14,7 @@ research-technology-atmospheric-tech = Атмосферные технологи research-technology-shuttlecraft = Шаттлостроение research-technology-ripley-aplu = Рипли АВП research-technology-advanced-atmospherics = Продвинутые атмос-технологии +research-technology-compact-technologies = Технологии сжатия материи research-technology-advanced-tools = Продвинутые инструменты research-technology-super-powercells = Супербатареи research-technology-bluespace-storage = Блюспейс-хранилище diff --git a/Resources/Prototypes/ADT/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/ADT/Entities/Structures/Piping/Atmospherics/pipes.yml index 6268266c4e3..89e3c8744f2 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Piping/Atmospherics/pipes.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Piping/Atmospherics/pipes.yml @@ -1,7 +1,7 @@ - type: entity parent: GasPipeHalf id: ADTGasPipeHalf - suffix: Half + suffix: Half, ADT components: - type: Transform anchored: false @@ -14,7 +14,7 @@ - type: entity parent: GasPipeStraight id: ADTGasPipeStraight - suffix: Straight + suffix: Straight, ADT components: - type: Transform anchored: false @@ -27,7 +27,7 @@ - type: entity parent: GasPipeBend id: ADTGasPipeBend - suffix: Bend + suffix: Bend, ADT components: - type: Transform anchored: false @@ -40,7 +40,7 @@ - type: entity parent: GasPipeTJunction id: ADTGasPipeTJunction - suffix: TJunction + suffix: TJunction, ADT components: - type: Transform anchored: false @@ -53,7 +53,7 @@ - type: entity parent: GasPipeFourway id: ADTGasPipeFourway - suffix: Fourway + suffix: Fourway, ADT components: - type: Transform anchored: false diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/misc.yml b/Resources/Prototypes/ADT/Recipes/Lathes/misc.yml new file mode 100644 index 00000000000..611520b85a8 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Lathes/misc.yml @@ -0,0 +1,7 @@ +- type: latheRecipe + id: StorageCanister + result: StorageCanister + category: Atmos + completetime: 3 + materials: + Steel: 1500 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9fa09c7fbe9..fe3832643dd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -118,6 +118,7 @@ unlitIdleState: unlit unlitRunningState: unlit-building staticRecipes: + - StorageCanister #ADT tweak - Wirecutter - Igniter - Signaller diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 4dc60314c47..4f5a2121e4a 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -180,6 +180,22 @@ - BorgModuleAdvancedTool - BorgModuleRCD +#ADT Tweak +- type: technology + id: ADTCompactTechnologies + name: research-technology-compact-technologies + icon: + sprite: Objects/Tools/rcd.rsi + state: icon + discipline: Industrial + tier: 2 + cost: 10000 + recipeUnlocks: + - RPD + - RPDAmmo + - RCD + - RCDAmmo + # Tier 3 - type: technology