Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Revert "Upstreams"" #647

Merged
merged 1 commit into from
Nov 30, 2024
Merged

Revert "Revert "Upstreams"" #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Resources/Changelog/ChangelogBkm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,3 +683,24 @@
id: 43
time: '2024-11-27T12:10:06.0000000+00:00'
url: https://github.com/Rxup/space-station-14/pull/953
- author: KayzelW
changes:
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0434\u043E\
\u0441\u0442\u0443\u043F\u044B \u0443 \u0434\u0432\u0435\u0440\u0435\u0439 \u0426\
\u041A \u0438 \u0438\u0445 \u043F\u0440\u043E\u0442\u043E\u0442\u0438\u043F\u043E\
\u0432."
type: Fix
id: 44
time: '2024-11-27T21:01:58.0000000+00:00'
url: https://github.com/Rxup/space-station-14/pull/957
- author: KayzelW
changes:
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0438\u0441\
\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u043C\u0430\u044F \u043F\u043B\u0430\
\u0442\u0430 \u0443 \u0434\u0432\u0435\u0440\u0435\u0439 \u0426\u041A(\u0441\
\u0442\u043E\u044F\u043B\u0430 \u0441\u0430\u043C\u0430\u044F \u043E\u0431\u044B\
\u0447\u043D\u0430\u044F DoorElectronics)"
type: Fix
id: 45
time: '2024-11-27T21:43:56.0000000+00:00'
url: https://github.com/Rxup/space-station-14/pull/958
3 changes: 3 additions & 0 deletions ...ale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/devices/electronics/door_access.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ ent-DoorElectronicsCCSecurity = { ent-DoorElectronics }
ent-DoorElectronicsCentCom = { ent-DoorElectronics }
.suffix = ЦентКом, Закрыт
.desc = { ent-DoorElectronics.desc }
ent-DoorElectronicsCCArmory = { ent-DoorElectronics }
.suffix = ЦентКом, Оружейная, Закрыт
.desc = { ent-DoorElectronics.desc }
ent-DoorElectronicsCCOfficer = { ent-DoorElectronics }
.suffix = ЦентКом, Офицер, Закрыт
.desc = { ent-DoorElectronics.desc }
Expand Down
8 changes: 5 additions & 3 deletions ...ces/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/structures/doors/airlocks/access.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,20 @@ ent-AirlockCCMedicalLocked = Шлюз ЦК
ent-AirlockHatchCentcommLocked = Шлюз ЦК
.suffix = ЦентКом, Закрыт
.desc = { ent-AirlockHatchCentcomm.desc }
ent-DoubleGlassAirlockCentcomLocked = Двойной Шлюз ЦК
.suffix = ЦентКом, Закрыт
.desc = { ent-DoubleGlassAirlock.desc }

ent-AirlockHatchMaintLocked = Технический Шлюз
.suffix = Техобслуживание, Закрыт
.desc = { ent-AirlockHatchMaint.desc }
ent-AirlockHatchSyndicateLocked = Шлюз Синдиката
.suffix = Синдикат, Закрыт
.desc = { ent-AirlockHatchCentcomm.desc }
ent-DoubleGlassAirlockCentcomLocked = Двойной Шлюз ЦК
.suffix = ЦентКом, Закрыт
.desc = { ent-DoubleGlassAirlock.desc }
ent-DoubleGlassAirlockSyndicateLocked = Двойной Шлюз Синдиката
.suffix = Синдикат, Закрыт
.desc = { ent-DoubleGlassAirlock.desc }

ent-WindoorMTFLocked = { ent-WindoorSecure }
.suffix = МТФ
.desc = { ent-WindoorSecure.desc }
Expand Down
Loading
Loading