Skip to content

Commit

Permalink
Merge branch 'space-syndicate:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
AwareFoxy authored Nov 10, 2024
2 parents 5ad3646 + 1aba058 commit 3eeb970
Show file tree
Hide file tree
Showing 4 changed files with 1,448 additions and 970 deletions.
33 changes: 16 additions & 17 deletions Resources/Changelog/ChangelogSyndie.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
Entries:
- author: Morty
changes:
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\
\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F \u043E\u0433\u043D\u0435\
\u0439 \u043F\u0438\u0442\u0430\u043D\u0438\u044F \u0434\u043B\u044F \u0432\u043D\
\u0435\u0448\u043D\u0438\u0445 \u0448\u043B\u044E\u0437\u043E\u0432"
type: Fix
id: 187
time: '2022-07-20T19:22:56.0000000+00:00'
- author: arazdelkin
changes:
- message: "CentCom \u0442\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0435\u0434\
\u043E\u0441\u0442\u0430\u0432\u043B\u044F\u0435\u0442 \u0446\u0435\u043B\u0438\
\ \u0434\u043B\u044F \u0441\u0442\u0430\u043D\u0446\u0438\u0438."
type: Add
id: 188
time: '2022-07-21T11:46:59.0000000+00:00'
- author: lapatison
changes:
- message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B \u0434\u0435\
Expand Down Expand Up @@ -4500,3 +4483,19 @@
id: 686
time: '2024-11-08T23:18:54.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2749
- author: Meguneri
changes:
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
\u0442\u0430 Maus."
type: Tweak
id: 687
time: '2024-11-09T19:48:08.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2756
- author: Ko4erga
changes:
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
\u0442\u0430 \u0422\u0443\u0448\u043A\u0430\u043D\u0447\u0438\u043A."
type: Tweak
id: 688
time: '2024-11-09T21:05:46.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2757
Loading

0 comments on commit 3eeb970

Please sign in to comment.