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

micro-upstream #5 #159

Merged
merged 23 commits into from
Dec 15, 2024
Merged

micro-upstream #5 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b4ee01e
Translate Upstream #2748 (#2837)
lzk228 Dec 10, 2024
9affb3c
Перевод Upstream #2830 (#2836)
lapatison Dec 10, 2024
588e4d7
translate borer names (#2835)
lzk228 Dec 10, 2024
42a8309
[Localize] Poster 52 (#2840)
MureixloI Dec 11, 2024
04b738a
Translate new diona names (#2839)
lzk228 Dec 11, 2024
9d99701
[Resprite] Medical uniforms & rollerbeds (#2802)
MureixloI Dec 11, 2024
ae180fc
Automatic changelog update
IanComradeBot Dec 11, 2024
d99479e
Revert "new year lobbyscreens removed" (#2831)
NotSoDana Dec 12, 2024
4efc031
Surgeon spawnpoint (#2841)
Ko4ergaPunk Dec 12, 2024
95ecf19
fix nukedisk chances (#2745)
TokenStyle Dec 12, 2024
d89e6aa
Adds surgeon spawnpoint on maps (#2845)
Ko4ergaPunk Dec 12, 2024
9c8207e
Winter stuff tweak (#2833)
Ko4ergaPunk Dec 14, 2024
7b908e9
[MAPS] Silly Christmass Date (#2854)
Doctorjakes Dec 14, 2024
d46a511
[MAPS] Paper Christmass Date (#2853)
XsenonDash Dec 14, 2024
eac62b1
[MAPS] Avrite New Year update (#2852)
CaptainMaru Dec 14, 2024
d27e5d9
[Maps] Tushkan new year update (#2851)
Ko4ergaPunk Dec 14, 2024
b33fc55
[Maps] Pilgrim new year update (#2850)
Ko4ergaPunk Dec 14, 2024
b75a24a
[Maps] Maus new year update (#2849)
Ko4ergaPunk Dec 14, 2024
1be6a6b
[Maps] Awesome new year update (#2848)
Stubaretka24 Dec 14, 2024
2f27031
[Maps] Outpost return (#2847)
kvant8 Dec 14, 2024
74f47dc
[Maps] Astra new year update (#2844)
lastPechkin Dec 14, 2024
7fa704a
Update corvax_delta.yml (#2856)
Bloodcanis Dec 14, 2024
c89fd75
Merge remote-tracking branch 'upstream/master' into upstream
AwareFoxy Dec 15, 2024
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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-SpawnPointPilot = pilot
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointSurgeon = surgeon
.desc = { ent-SpawnPointJobBase.desc }
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ent-SpawnPointPilot = пилот
.desc = { ent-SpawnPointJobBase.desc }
ent-SpawnPointSurgeon = хирург
.desc = { ent-SpawnPointJobBase.desc }
19,951 changes: 14,479 additions & 5,472 deletions Resources/Maps/corvax_astra.yml
View file
Open in desktop

Large diffs are not rendered by default.

45,859 changes: 36,141 additions & 9,718 deletions Resources/Maps/corvax_avrite.yml
View file
Open in desktop

Large diffs are not rendered by default.

54,806 changes: 27,582 additions & 27,224 deletions Resources/Maps/corvax_awesome.yml
View file
Open in desktop

Large diffs are not rendered by default.

1,494 changes: 882 additions & 612 deletions Resources/Maps/corvax_delta.yml
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading