From 0d48777d7ca1e07e335fa232deb1312cb170368a Mon Sep 17 00:00:00 2001 From: Flopochka Date: Wed, 21 Aug 2024 21:00:17 +0300 Subject: [PATCH 1/5] =?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 From 783e3c1505f969650996fa11e56508294e8b0cc4 Mon Sep 17 00:00:00 2001 From: Flopochka Date: Wed, 21 Aug 2024 21:57:44 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/research/technologies.ftl | 1 - Resources/Locale/ru-RU/ADT/research/technologies.ftl | 1 + Resources/Locale/ru-RU/research/technologies.ftl | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/research/technologies.ftl diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 0ba9737cf20..70ca8d018ac 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -15,7 +15,6 @@ 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/research/technologies.ftl b/Resources/Locale/ru-RU/ADT/research/technologies.ftl new file mode 100644 index 00000000000..7d07e47eb67 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/research/technologies.ftl @@ -0,0 +1 @@ +research-technology-compact-technologies = Технологии сжатия материи diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl index a07dc972240..5fbf5a748a1 100644 --- a/Resources/Locale/ru-RU/research/technologies.ftl +++ b/Resources/Locale/ru-RU/research/technologies.ftl @@ -14,7 +14,6 @@ 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 = Блюспейс-хранилище From ab840f4e41fd6582776bff5409dbe1f13baeb783 Mon Sep 17 00:00:00 2001 From: Flopochka Date: Thu, 22 Aug 2024 20:48:13 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=86=D0=B5=D0=BD=D1=83=20=D0=B8=20=D0=BA=D1=80=D0=B0=D1=84?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Recipes/Lathes/misc.yml | 2 +- Resources/Prototypes/ADT/Research/industrial.yml | 15 +++++++++++++++ .../Storage/Canisters/gas_canisters.yml | 2 +- Resources/Prototypes/Research/industrial.yml | 16 ---------------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/misc.yml b/Resources/Prototypes/ADT/Recipes/Lathes/misc.yml index 611520b85a8..cd79ae4641b 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/misc.yml @@ -4,4 +4,4 @@ category: Atmos completetime: 3 materials: - Steel: 1500 + Steel: 3000 diff --git a/Resources/Prototypes/ADT/Research/industrial.yml b/Resources/Prototypes/ADT/Research/industrial.yml index 2ad05129d9b..825f7db5acc 100644 --- a/Resources/Prototypes/ADT/Research/industrial.yml +++ b/Resources/Prototypes/ADT/Research/industrial.yml @@ -9,3 +9,18 @@ cost: 15000 recipeUnlocks: - ADTIndustrialSMESMachineCircuitboard + +- 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 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 6528480a200..a86e4c69f4e 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -99,7 +99,7 @@ components: - GasTank - type: StaticPrice - price: 1000 + price: 250 #ADT Tweak - type: AccessReader access: [["Atmospherics"], ["Engineering"], ["Research"]] - type: Lock diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 4f5a2121e4a..4dc60314c47 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -180,22 +180,6 @@ - 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 From d897301cffc3984bbcd68e06f4ccd34592872dd9 Mon Sep 17 00:00:00 2001 From: Flopochka Date: Fri, 23 Aug 2024 13:02:08 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D1=85=D1=83=D0=BB=D0=B8=20=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BD=D0=B5=20=D0=B2=D0=BF=D1=80=D0=BE=D1=88=D0=BB?= =?UTF-8?q?=D0=BE=D0=BC=20=D0=BA=D0=BE=D0=BC=D0=B8=D1=82=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=B7=D0=BD=D0=B0=D1=8E,=20=D1=8D=D1=82=D0=BE=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D1=87=D0=B0=D1=81=D1=82=D0=B8=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=87=D0=B8=D0=BD=D0=B8=D0=BB=20=D0=BA=D1=80=D0=B0=D1=84=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index fe3832643dd..c23d0fb24e5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -310,6 +310,10 @@ - Igniter - HandHeldMassScanner - PowerCellMicroreactor + - RCD #ADT Tweak + - RCDAmmo #ADT Tweak + - RPDAmmo #ADT Tweak + - RPD #ADT Tweak - PowerCellHigh - WeaponPistolCHIMP - ClothingMaskWeldingGas From 3cf0cb2a7bedd74304ffac6767ac56430eaa502d Mon Sep 17 00:00:00 2001 From: Flopochka Date: Fri, 23 Aug 2024 13:32:16 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=BD=D0=B0=D0=BA=D0=B8=D0=B4=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=B7=D0=B5=D1=82=D0=BE=D1=87=D0=B5=D0=BA=20zzzzzzzzz?= =?UTF-8?q?zzzzzzzzzzzzzzzzzzz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Structures/Storage/Canisters/gas_canisters.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index a86e4c69f4e..04fa35b1b54 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -100,6 +100,7 @@ - GasTank - type: StaticPrice price: 250 #ADT Tweak + # price: 1000 - type: AccessReader access: [["Atmospherics"], ["Engineering"], ["Research"]] - type: Lock