From dcaa7e96382a3de96f78a1f769a70b56732c823e Mon Sep 17 00:00:00 2001 From: Hero010h <163765999+Hero010h@users.noreply.github.com> Date: Tue, 24 Dec 2024 18:07:25 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D1=80=D0=B5=D1=81=D0=BB=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D1=81=D1=82=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_white/locales-new/autotranslate-111.ftl | 22 +++---- .../Markers/Spawners/Random/furniture.yml | 2 + .../Entities/Structures/Furniture/chairs.yml | 2 +- .../Construction/Graphs/furniture/seats.yml | 60 +++++++++++-------- 4 files changed, 50 insertions(+), 36 deletions(-) diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-111.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-111.ftl index 0acf4a1419..cfd43c9230 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-111.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-111.ftl @@ -13,25 +13,25 @@ ent-ChairGreyscale = стул .suffix = Белый ent-ChairBrass = медный стул .desc = медный стул -ent-BlackComfyChair = черный удобный стул +ent-BlackComfyChair = чёрное удобное кресло .desc = Выглядит удобно. -ent-BlueComfyChair = синий удобный стул +ent-BlueComfyChair = синее удобное кресло .desc = Выглядит удобно. -ent-GreenComfyChair = зеленый удобный стул +ent-GreenComfyChair = зеленое удобное кресло .desc = Выглядит удобно. -ent-OrangeComfyChair = оранжевый удобный стул +ent-OrangeComfyChair = оранжевое удобное кресло .desc = Выглядит удобно. -ent-PinkComfyChair = розовый удобный стул +ent-PinkComfyChair = розовое удобное кресло .desc = Выглядит удобно. -ent-PurpleComfyChair = фиолетовый удобный стул +ent-PurpleComfyChair = фиолетовое удобное кресло .desc = Выглядит удобно. -ent-RedComfyChair = красный удобный стул +ent-RedComfyChair = красное удобное кресло .desc = Выглядит удобно. -ent-WhiteComfyChair = белый удобный стул +ent-WhiteComfyChair = белое удобное кресло .desc = Выглядит удобно. -ent-BrownComfyChair = коричневый удобный стул +ent-BrownComfyChair = коричневое удобное кресло .desc = Выглядит удобно. -ent-LightBlueComfyChair = светло-синий удобный стул +ent-LightBlueComfyChair = светло-синее удобное кресло .desc = Выглядит удобно. ent-ChairWeb = стул для веб-разработчиков .desc = Для настоящих веб-разработчиков. @@ -39,7 +39,7 @@ ent-SteelBench = стальная скамья .desc = Длинный стул, сделанный для метро. Действительно стандартный дизайн. ent-WoodenBench = деревянная скамья .desc = Вы получили занозу? Ну, по крайней мере, это экологично. -ent-BlackPaddedStool = черный мягкий стул +ent-BlackPaddedStool = чёрный мягкий стул .desc = Мягкий мешок-стул, комфортный! ent-BluePaddedStool = синий мягкий стул .desc = Мягкий мешок-стул, комфортный! diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml index 2236a0a776..12605444b0 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml @@ -17,6 +17,8 @@ - PurpleComfyChair - RedComfyChair - WhiteComfyChair + - LightBlueComfyChair + - BrownComfyChair chance: 1 - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index e8c94824bd..eea356c5d2 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -190,7 +190,7 @@ - type: Sprite sprite: Structures/Furniture/chairs.rsi state: comfy-greyscale - color: "#23242c" + color: "#606060" - type: Construction graph: Seat node: blackChairComfy diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index 42d2b14207..34998c4c59 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -76,6 +76,18 @@ - material: Steel amount: 2 doAfter: 1 + #WD edit start + - to: brownChairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 + - to: lightBlueChairComfy + steps: + - material: Steel + amount: 2 + doAfter: 1 + #WD edit end - to: chairPilotSeat steps: - material: Steel @@ -356,38 +368,38 @@ - node: brownChairComfy entity: BrownComfyChair edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: SheetSteel1 - amount: 2 - steps: - - tool: Screwing - doAfter: 1 + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 - node: lightBlueChairComfy entity: LightBlueComfyChair edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: SheetSteel1 - amount: 2 - steps: - - tool: Screwing - doAfter: 1 + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 - node: chairComfy entity: ComfyChair edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: SheetSteel1 - amount: 2 - steps: - - tool: Screwing - doAfter: 1 + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 # WD edit end From ed94656d6db88336496f77b941659a45363876d3 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Wed, 25 Dec 2024 15:29:30 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Structures/Furniture/chairs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index eea356c5d2..86179a19d0 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -190,7 +190,7 @@ - type: Sprite sprite: Structures/Furniture/chairs.rsi state: comfy-greyscale - color: "#606060" + color: "#606060" # WD Fix - type: Construction graph: Seat node: blackChairComfy @@ -566,7 +566,7 @@ - type: Sprite sprite: Structures/Furniture/chairs.rsi state: pufi-box-greyscale - color: "#23242c" + color: "#606060" # WD Fix - type: Construction graph: Seat node: blackPaddedStool