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

Jump to bottom

Corvax cherry pick 17 #359

Merged
merged 15 commits into from
Sep 26, 2023
Merged

Corvax cherry pick 17 #359

merged 15 commits into from
Sep 26, 2023

Conversation

TheArturZh
Copy link
Member

Описание PR

Черри-пик корвакса. ПРы:
space-syndicate/space-station-14#1433
space-syndicate/space-station-14#1436
space-syndicate/space-station-14#1399
space-syndicate/space-station-14#1419
space-syndicate/space-station-14#1437
space-syndicate/space-station-14#1438
space-syndicate/space-station-14#1444
space-syndicate/space-station-14#1445
space-syndicate/space-station-14#1448
space-syndicate/space-station-14#1453
space-syndicate/space-station-14#1451
space-syndicate/space-station-14#1455
space-syndicate/space-station-14#1456

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑

  • add: Добавлены переводы от корвакса

lapatison and others added 14 commits September 26, 2023 16:12
@lapatison @Morb0
@HerCoyote23 @TheArturZh
Translate Upstream SerbiaStrong-220#1430 (SerbiaStrong-220#1433)
9218b62 
Co-authored-by: Morb0 <[email protected]>
Co-authored-by: HerCoyote23 <[email protected]>
@lapatison @TheArturZh
Fix collector.ftl translation (SerbiaStrong-220#1436)
0b2ebe4
@lzk228 @TheArturZh
Add do not map suffix to corvax stamps (SerbiaStrong-220#1399)
aa1ae1e
@lzk228 @TheArturZh
localize slurred accent (SerbiaStrong-220#1419)
edf95f3
@lapatison @TheArturZh
Translation edits (SerbiaStrong-220#1437)
3d26a09
@lzk228 @TheArturZh
fix qm suit crate locale (SerbiaStrong-220#1438)
7662169
@JerryImMouse @TheArturZh
[Resprite] Harmmode (SerbiaStrong-220#1444)
3e30941
@JerryImMouse @TheArturZh
[Resprite] Disarm (SerbiaStrong-220#1445)
f1fedef
@JerryImMouse @TheArturZh
[Resprite] RatKing Actions (SerbiaStrong-220#1448)
bfd94a0
@lapatison @TheArturZh
Translate Upstream space-wizards#1447 (SerbiaStrong-220#1453)
3898386
@lzk228 @TheArturZh
Localization of lisp (SerbiaStrong-220#1451)
ebd04c1
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#1454 (SerbiaStrong-220#1455)
b9b7e6b
@lzk228 @TheArturZh
Translate rat_king_commands.yml (SerbiaStrong-220#1456)
ad59645
@TheArturZh
Merge branch 'master' into corvax-cherry-pick-17
fd40c21
@github-actions github-actions bot added Changes: Localization Изменение затронуло файлы ".ftl" Changes: Sprites Изменение затронуло файлы ".rsu / .png" labels Sep 26, 2023
@github-actions
Copy link

github-actions bot commented Sep 26, 2023 •
edited
Loading

RSI Diff Bot; head commit 1ae1ac8 merging into 5b8dabf
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Interface/Actions/actions_rat_king.rsi

State Old New Status
attack Modified
attackOff Modified
follow Modified
followOff Modified
loose Modified
looseOff Modified
stay Modified
stayOff Modified

Edit: diff updated after 1ae1ac8

@TheArturZh TheArturZh merged commit b526da7 into SerbiaStrong-220:master Sep 26, 2023
@TheArturZh TheArturZh deleted the corvax-cherry-pick-17 branch October 4, 2023 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Localization Изменение затронуло файлы ".ftl" Changes: Sprites Изменение затронуло файлы ".rsu / .png"
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@TheArturZh @lapatison @lzk228 @JerryImMouse