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 cherrypick 29 #2124

Merged
merged 23 commits into from
Oct 20, 2024
Merged

Corvax cherrypick 29 #2124

merged 23 commits into from
Oct 20, 2024

Conversation

Kirus59
Copy link
Collaborator

@Kirus59 Kirus59 commented Oct 19, 2024 •
edited
Loading

Описание PR

Черри-пик ПРов от Корвакса:

Проверки

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

Изменения

no cl, no fun

lzk228 and others added 7 commits October 19, 2024 22:51
@lzk228 @Kirus59
Little barsign tweaks (space-wizards#2528)
ddd7e64
@NotSoDana @Kirus59
Fix not translated intercom locale (space-wizards#2541)
8ef248e
@lapatison @NotSoDana
@lzk228 @Kirus59
Translate Upstream space-wizards#2534 (space-wizards#2542)
dc43cb6 
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
@lapatison @Kirus59
Translate Upstream space-wizards#2547 (space-wizards#2549)
be47219 
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
@lapatison @Kirus59
Translate Upstream space-wizards#2556 (space-wizards#2557)
9a071e0 
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
@NotSoDana @Kirus59
Fix snoth desc (space-wizards#2559)
4afbd43
@NotSoDana @lzk228 @Kirus59
fix WallPlastitanium desc (space-wizards#2567)
bbc7e70 
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
@github-actions github-actions bot added Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: Localization Изменение затронуло файлы ".ftl" labels Oct 19, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 19, 2024 •
edited
Loading

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

Resources/Textures/Structures/Wallmounts/barsign.rsi

State Old New Status
thecoderbus Modified

Edit: diff updated after dfd7c58

Kirus59 and others added 12 commits October 20, 2024 00:24
@Kirus59
department-Silicon fix
0caf5c6
@Kirus59
Add blueshield and locale fixes
a657997
@lzk228 @Kirus59
Fix misspeled genders in locale (space-wizards#2575)
878ba79
@lzk228 @Kirus59
Fix cryo message gender (space-wizards#2576)
708e74c
@lapatison @lzk228 @Kirus59
Partially Translate Upstream space-wizards#2580 (space-wizards#2586)
57b6046 
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
@lapatison @NotSoDana @Kirus59
Translate Upstream space-wizards#2587 (space-wizards#2588)
f398e4e 
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
@lapatison @NotSoDana
@lzk228 @Kirus59
Translate Upstream space-wizards#2602 (space-wizards#2606)
d6fd8cf 
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
@lzk228 @lapatison
@ficcialfaint @Kirus59
Additional Translate space-wizards#2580 (space-wizards#2611)
ea408aa 
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
@lzk228 @Kirus59
fix locale (space-wizards#2637)
be9226f
@lapatison @Kirus59
Translate Upstream space-wizards#2640 (space-wizards#2641)
d6c4e0d 
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
@NotSoDana @Kirus59
tweak SmartFridge locale name (space-wizards#2671)
bca8630
@Kirus59
fix duplicates
de66033
@Kirus59 Kirus59 changed the title Corvax cherrypick 29 [Do Not Merge] Corvax cherrypick 29 Oct 19, 2024
@Kirus59 Kirus59 changed the title [Do Not Merge] Corvax cherrypick 29 Corvax cherrypick 29 Oct 20, 2024
@Kirus59 Kirus59 requested a review from stalengd October 20, 2024 08:28
@stalengd stalengd merged commit 24d25f9 into SerbiaStrong-220:master Oct 20, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stalengd stalengd stalengd approved these changes

Assignees
No one assigned
Labels
Changes: Localization Изменение затронуло файлы ".ftl" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Kirus59 @stalengd @lzk228 @NotSoDana @lapatison