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

Апстрим карт и поднятый гит #229

Merged
merged 10 commits into from
Jan 8, 2025
Merged

Апстрим карт и поднятый гит #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
17ebe53
[Maps] Outpost update (#2901)
kvak-8 Jan 4, 2025
d753662
[MAPS] Paper Tweak (#2905)
XsenonDash Jan 7, 2025
cb0752b
[Maps] Awesome Tweak (#2906)
Stubaretka24 Jan 7, 2025
bfa80bf
[Maps] Astra remove new year stuff (#2907)
lastPechkin Jan 7, 2025
ba4a942
[Maps] New map Cute Installation (#2902)
OneYaHoy Jan 7, 2025
c0be008
Automatic changelog update
IanComradeBot Jan 7, 2025
3301488
[Maps] Map pool Glacier (#2909)
Ko4ergaPunk Jan 8, 2025
ccd1fb1
[Maps] Return salvage shuttle (#2910)
Ko4ergaPunk Jan 8, 2025
e560d7f
Merge remote-tracking branch 'corvax/master' into Upstream4
FireNameFN Jan 8, 2025
b63ea1e
Delete Resources/Locale/ru-RU/_corvaxNext directory
FireNameFN Jan 8, 2025
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
1 change: 1 addition & 0 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

Loading
Loading