Skip to content

Commit

Permalink
upstream 08012025
Browse files Browse the repository at this point in the history
Апстрим карт и поднятый гит
  • Loading branch information
Vonsant authored Jan 8, 2025
2 parents 0acbb77 + b63ea1e commit edde7e1
Show file tree
Hide file tree
Showing 15 changed files with 175,208 additions and 29,490 deletions.
1 change: 1 addition & 0 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public sealed class PostMapInitTest
"CorvaxMaus",
"CorvaxIshimura",
"CorvaxPaper",
"CorvaxCuteInstallation",
"CorvaxPilgrim",
"CorvaxSplit",
"CorvaxTerra",
Expand Down
16 changes: 8 additions & 8 deletions Resources/Changelog/ChangelogSyndie.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
Entries:
- author: lapatison
changes:
- message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u043E \u043F\u043E\
\u0441\u043B\u0435\u0434\u043D\u0435\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\
\u0435\u043D\u0438\u0435"
type: Tweak
id: 240
time: '2022-09-12T01:12:22.0000000+00:00'
- author: Morty
changes:
- message: "\u0412\u0440\u0435\u043C\u044F \u0432\u043E\u0437\u0432\u0440\u0430\u0449\
Expand Down Expand Up @@ -4583,3 +4575,11 @@
id: 739
time: '2025-01-02T19:37:04.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2742
- author: OneYa
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 midpop \u043A\
\u0430\u0440\u0442\u0430 Cute Installation."
type: Add
id: 740
time: '2025-01-07T14:17:37.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2902
3 changes: 0 additions & 3 deletions Resources/Locale/ru-RU/_corvaxNext/abilitties/listen-up.ftl

This file was deleted.

Loading

0 comments on commit edde7e1

Please sign in to comment.