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 f589072cca..007fd87260 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-111.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-111.ftl @@ -13,33 +13,33 @@ ent-ChairGreyscale = стул .suffix = Белый ent-ChairBrass = бронзовое кресло .desc = { ent-SeatBase.desc } -ent-BlackComfyChair = черный удобный стул - .desc = Выглядит удобно. -ent-BlueComfyChair = синий удобный стул - .desc = Выглядит удобно. -ent-GreenComfyChair = зеленый удобный стул - .desc = Выглядит удобно. -ent-OrangeComfyChair = оранжевый удобный стул - .desc = Выглядит удобно. -ent-PinkComfyChair = розовый удобный стул - .desc = Выглядит удобно. -ent-PurpleComfyChair = фиолетовый удобный стул - .desc = Выглядит удобно. -ent-RedComfyChair = красный удобный стул - .desc = Выглядит удобно. -ent-WhiteComfyChair = белый удобный стул - .desc = Выглядит удобно. -ent-BrownComfyChair = коричневый удобный стул - .desc = Выглядит удобно. -ent-LightBlueComfyChair = светло-синий удобный стул - .desc = Выглядит удобно. +ent-BlackComfyChair = чёрное удобное кресло + .desc = { ent-ComfyChair.desc } +ent-BlueComfyChair = синее удобное кресло + .desc = { ent-ComfyChair.desc } +ent-GreenComfyChair = зеленое удобное кресло + .desc = { ent-ComfyChair.desc } +ent-OrangeComfyChair = оранжевое удобное кресло + .desc = { ent-ComfyChair.desc } +ent-PinkComfyChair = розовое удобное кресло + .desc = { ent-ComfyChair.desc } +ent-PurpleComfyChair = фиолетовое удобное кресло + .desc = { ent-ComfyChair.desc } +ent-RedComfyChair = красное удобное кресло + .desc = { ent-ComfyChair.desc } +ent-WhiteComfyChair = белое удобное кресло + .desc = { ent-ComfyChair.desc } +ent-BrownComfyChair = коричневое удобное кресло + .desc = { ent-ComfyChair.desc } +ent-LightBlueComfyChair = светло-синее удобное кресло + .desc = { ent-ComfyChair.desc } ent-ChairWeb = стул для веб-разработчиков .desc = Для настоящих веб-разработчиков. 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..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: "#23242c" + 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 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