From fc23c2fe0a3baedfb6a5a28b17c9b6cd147d74c9 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:49:48 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl | 8 +------- Resources/Locale/ru-RU/cargo/cargo-console-component.ftl | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl b/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl index 1cc15c89d8..0f63d1dfdf 100644 --- a/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl +++ b/Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl @@ -1,11 +1,5 @@ ### Announcement earlyleave-cryo-job-unknown = Должность неизвестна -earlyleave-cryo-announcement = - { $character } ({ $job }) { $gender -> - [male] был перемещён - [female] была перемещена - [epicene] были перемещены - *[neuter] был перемещён - } в криогенное хранилище! +earlyleave-cryo-announcement = {$character} ({$job}) был перемещён в криогенное хранилище! earlyleave-cryo-sender = Станция diff --git a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl index 1af2b655f8..34759621ce 100644 --- a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl +++ b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl @@ -35,7 +35,6 @@ cargo-console-paper-print-name = Заказ #{ $orderNumber } cargo-console-paper-print-text = Заказ #{ $orderNumber } Товар: { $itemName } - Кол-во: { $orderQuantity } Запросил: { $requester } Причина: { $reason } Одобрил: { $approver } From c422219f5baa2c7a34d1589cba6e727e19f114d2 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:50:43 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StationEvents/OscillatingStationEventScheduler.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Content.Server/StationEvents/OscillatingStationEventScheduler.cs b/Content.Server/StationEvents/OscillatingStationEventScheduler.cs index b4e2f40dd4..1e6dbd14a1 100644 --- a/Content.Server/StationEvents/OscillatingStationEventScheduler.cs +++ b/Content.Server/StationEvents/OscillatingStationEventScheduler.cs @@ -2,11 +2,10 @@ using System.Diagnostics.CodeAnalysis; using Content.Server.GameTicking; using Content.Server.GameTicking.Rules; -using Content.Server.GameTicking.Rules.Components; +using Content.Server.GameTicking.Components; using Content.Server.StationEvents.Components; using Content.Shared.CCVar; using Robust.Shared.Configuration; -using Content.Server.GameTicking.Components; using Robust.Shared.Random; using Robust.Shared.Timing; using Robust.Shared.Utility; From 917974c6bdb2d7635805fe8e8594ef992121623f Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Mon, 9 Sep 2024 22:11:21 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 -- Resources/Locale/ru-RU/interaction/verbs/noop.ftl | 2 +- Resources/Maps/_LostParadise/submarine.yml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a37c02cd45..fb765a1de2 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,6 @@ ### Windows > 1. Клонируйте репо `git clone https://github.com/Lost-Paradise-Project/Lost-Paradise.git` -> 2. Запустите `git submodule update --init --recursive` в терминале для скачивания движка. > 3. Запустите `Scripts/bat/buildAllDebug.bat` после каждого измения. > 4. Запустите `Scripts/bat/runQuickAll.bat` для запуска клиента и сервера. > 5. Подключитесь к "localhost" в клиенте. @@ -45,7 +44,6 @@ ### Linux > 1. Клонируйте репо `git clone https://github.com/Lost-Paradise-Project/Lost-Paradise.git` -> 2. Запустите `git submodule update --init --recursive` в терминале для скачивания движка. > 3. Запустите `Scripts/sh/buildAllDebug.sh` после каждого изменения. (После изменения папки Resources не требуется) > 4. Запустите `Scripts/sh/runQuickAll.sh` для запуска клиента и сервера. > 5. Подключитесь к "localhost" в клиенте. diff --git a/Resources/Locale/ru-RU/interaction/verbs/noop.ftl b/Resources/Locale/ru-RU/interaction/verbs/noop.ftl index 8dd3b64a4f..4cd66d5703 100644 --- a/Resources/Locale/ru-RU/interaction/verbs/noop.ftl +++ b/Resources/Locale/ru-RU/interaction/verbs/noop.ftl @@ -18,7 +18,7 @@ interaction-PetAnimal-description = Погладить животное. interaction-PetAnimal-success-self-popup = { interaction-Pet-success-self-popup } interaction-PetAnimal-success-target-popup = { interaction-Pet-success-target-popup } interaction-PetAnimal-success-others-popup = { interaction-Pet-success-others-popup } -interaction-KnockOn-name = постучать +interaction-KnockOn-name = Постучать interaction-KnockOn-description = Постучите по цели, чтобы привлечь к себе внимание. interaction-KnockOn-success-self-popup = Вы постучали по { THE($target) }. interaction-KnockOn-success-target-popup = { THE($user) } стучит по вам. diff --git a/Resources/Maps/_LostParadise/submarine.yml b/Resources/Maps/_LostParadise/submarine.yml index 762f7e619d..d322a8b50e 100644 --- a/Resources/Maps/_LostParadise/submarine.yml +++ b/Resources/Maps/_LostParadise/submarine.yml @@ -239695,7 +239695,7 @@ entities: pos: -37.5,10.5 parent: 2 - type: WarpPoint - location: уничтожает цель взрыва + location: цель для взрыва уборщика - uid: 37565 components: - type: Transform From 2345ca6a722aae206ada59bdd85cbea16a5a4aae Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Mon, 9 Sep 2024 22:53:06 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/_LostParadise/Languages/custom.ftl | 10 ++++++---- .../Prototypes/_LostParadise/Traits/languages.yml | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/ru-RU/_LostParadise/Languages/custom.ftl b/Resources/Locale/ru-RU/_LostParadise/Languages/custom.ftl index b736c64f0e..32a2300bbb 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Languages/custom.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Languages/custom.ftl @@ -1,4 +1,6 @@ -language-Dwarf-name = Дварфский язык -language-Dwarf-description = Пиво пиво) -language-Elf-name = Эльфийский язык -language-Elf-description = Длинный язык прям как рост. +language-DwarfLang-name = Дварфский язык +language-DwarfLang-description = Пиво пиво) +language-ElfLang-name = Эльфийский язык +language-ElfLang-description = Длинный язык прям как рост. +language-LPPSikTaj-name = Язык сик' таяр +language-LPPSikTaj-description = Язык для настоящего мурчащего человека. diff --git a/Resources/Prototypes/_LostParadise/Traits/languages.yml b/Resources/Prototypes/_LostParadise/Traits/languages.yml index 9a07ea9d67..fe75ee70ee 100644 --- a/Resources/Prototypes/_LostParadise/Traits/languages.yml +++ b/Resources/Prototypes/_LostParadise/Traits/languages.yml @@ -5,9 +5,9 @@ components: - type: LanguageKnowledgeModifier speaks: - - Elf + - ElfLang understands: - - Elf + - ElfLang requirements: - !type:CharacterSpeciesRequirement inverted: false @@ -28,9 +28,9 @@ components: - type: LanguageKnowledgeModifier speaks: - - Dwarf + - DwarfLang understands: - - Dwarf + - DwarfLang requirements: - !type:CharacterSpeciesRequirement inverted: false