Skip to content

Commit

Permalink
Merge pull request #121 from Evgencheg/master
Browse files Browse the repository at this point in the history
фиксы
  • Loading branch information
Evgencheg authored Sep 10, 2024
2 parents da83271 + d62eb14 commit 223d3e0
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,13 @@
### 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" в клиенте.
### 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" в клиенте.
Expand Down
10 changes: 6 additions & 4 deletions Resources/Locale/ru-RU/_LostParadise/Languages/custom.ftl
Original file line number Diff line number Diff line change
@@ -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 = Язык для настоящего мурчащего человека.
8 changes: 1 addition & 7 deletions Resources/Locale/ru-RU/bed/cryostorage/cryogenic-storage.ftl
Original file line number Diff line number Diff line change
@@ -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 = Станция
1 change: 0 additions & 1 deletion Resources/Locale/ru-RU/cargo/cargo-console-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ cargo-console-paper-print-name = Заказ #{ $orderNumber }
cargo-console-paper-print-text =
Заказ #{ $orderNumber }
Товар: { $itemName }
Кол-во: { $orderQuantity }
Запросил: { $requester }
Причина: { $reason }
Одобрил: { $approver }
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/interaction/verbs/noop.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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) } стучит по вам.
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_LostParadise/submarine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239709,7 +239709,7 @@ entities:
pos: -37.5,10.5
parent: 2
- type: WarpPoint
location: уничтожает цель взрыва
location: цель для взрыва уборщика
- uid: 37565
components:
- type: Transform
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/_LostParadise/Traits/languages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
components:
- type: LanguageKnowledgeModifier
speaks:
- Elf
- ElfLang
understands:
- Elf
- ElfLang
requirements:
- !type:CharacterSpeciesRequirement
inverted: false
Expand All @@ -28,9 +28,9 @@
components:
- type: LanguageKnowledgeModifier
speaks:
- Dwarf
- DwarfLang
understands:
- Dwarf
- DwarfLang
requirements:
- !type:CharacterSpeciesRequirement
inverted: false
Expand Down

0 comments on commit 223d3e0

Please sign in to comment.