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 26 #950

Merged
merged 54 commits into from
Apr 29, 2024
Merged

Corvax cherrypick 26 #950

merged 54 commits into from
Apr 29, 2024

Conversation

TheArturZh
Copy link
Member

@TheArturZh TheArturZh commented Apr 28, 2024 •
edited
Loading

Описание PR

Черри-пик переводов, одежды, напитков, респрайтов а так же механики скрытых описаний как развитие идеи Александра
ПРы:

Медиа

Проверки

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

Изменения

no cl

lapatison and others added 30 commits April 28, 2024 23:08
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#1875 SerbiaStrong-220#1877 (Serbi…
9b49a9a 
…aStrong-220#1879)
@xKREKSx @TheArturZh
[Resprite] Electric grill (SerbiaStrong-220#1882)
263add6
@SonicHDC @TheArturZh
Microwave sprite offset (SerbiaStrong-220#1883)
b6e6cee
@lapatison @lzk228 @TheArturZh
Translate Upstream SerbiaStrong-220#1885 (SerbiaStrong-220#1887)
03c2048 
Co-authored-by: lzk <[email protected]>
@lapatison @TheArturZh
Locale fix (SerbiaStrong-220#1888)
93c77d6
@Ko4ergaPunk @TheArturZh
Corvax drinks added (SerbiaStrong-220#1736)
903fee6
@Ko4ergaPunk @TheArturZh
Corvax drinks update (SerbiaStrong-220#1892)
2875eae
@lapatison @TheArturZh
Translate SerbiaStrong-220#1893 (SerbiaStrong-220#1894)
e06fa5b
@lapatison @TheArturZh
Jug label name translation (SerbiaStrong-220#1895)
1a1b961
@DreamlyJack @TheArturZh
Resprite uniforms and winter coat mime (SerbiaStrong-220#1898)
c26da2a
@GamaYouNow @TheArturZh
Resprite pumpkin head (SerbiaStrong-220#1901)
2a13ac4
@lzk228 @TheArturZh
Fix locale (SerbiaStrong-220#1906)
dd8199f
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#1907 (SerbiaStrong-220#1908)
44c7f27
@lzk228 @TheArturZh
Tweak locale (SerbiaStrong-220#1909)
1f9a1dc
@lapatison @TheArturZh
Signs and posters tweaks (SerbiaStrong-220#1912)
a8cf10e
@lzk228 @TheArturZh
Resprite decoys + box sprite fixes (SerbiaStrong-220#1913)
674d644
@lzk228 @TheArturZh
Localize hands interface (SerbiaStrong-220#1914)
99ac600
@lapatison @TheArturZh
Fix translation (SerbiaStrong-220#1919)
541ec9e
@MureixloI @TheArturZh
Resprite network configurator (SerbiaStrong-220#1922)
6be05ec
@lzk228 @TheArturZh
Fix highsec airlock visual (SerbiaStrong-220#1923)
b817cc1
@DreamlyJack @TheArturZh
Resprite hawaii and flannel shirts (SerbiaStrong-220#1926)
936fe5b
@lapatison @TheArturZh
Locale speech emotes (SerbiaStrong-220#1927)
2aa4889
@lapatison @TheArturZh
Translation fixes (SerbiaStrong-220#1928)
7b55bd4
@JustArt1m @TheArturZh
Add japan school clothes (SerbiaStrong-220#1929)
a6c0c97
@lapatison @lzk228 @TheArturZh
Translate Upstream SerbiaStrong-220#1924 (SerbiaStrong-220#1936)
d7a35e2 
Co-authored-by: lzk <[email protected]>
@lapatison @TheArturZh
New sign locale (SerbiaStrong-220#1937)
82d5f6a
@DreamlyJack @TheArturZh
Fix sprite hawaiian shirts (SerbiaStrong-220#1940)
61760e8
@lapatison @TheArturZh
war-declarator timer fix (SerbiaStrong-220#1947)
6433dbf
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#1949 (SerbiaStrong-220#1951)
6eaa3a1
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#1957 (SerbiaStrong-220#1959)
1a0331c
lapatison and others added 22 commits April 29, 2024 00:05
@lapatison @TheArturZh
Translation fixes (SerbiaStrong-220#1967)
c423ca7
@lapatison @TheArturZh
Minor locale cleanup (SerbiaStrong-220#1970)
a10095a
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#1969 (SerbiaStrong-220#1971)
6273622
@lapatison @lzk228 @TheArturZh
Translate Upstream SerbiaStrong-220#1980 (SerbiaStrong-220#1983)
2228b67 
Co-authored-by: lzk <[email protected]>
@CatBackGround @lzk228
@lapatison @TheArturZh
Locale Guidebook for Revolution. (SerbiaStrong-220#1985)
9fe2388 
Co-authored-by: lzk <[email protected]>
Co-authored-by: lapatison <[email protected]>
@lzk228 @TheArturZh
Guidebook translate (Controls, radio, adv brute) (SerbiaStrong-220#1986)
2ee3335
@lzk228 @lapatison @TheArturZh
Guidebook translate (Trairors, zombie) (SerbiaStrong-220#1987)
0edd51f 
Co-authored-by: lapatison <[email protected]>
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#1993 (SerbiaStrong-220#1994)
cc3345a
@lzk228 @TheArturZh
Send station goal also to centcomm fax (SerbiaStrong-220#1999)
6c2b68c
@lapatison @lzk228 @TheArturZh
Translate Upstream SerbiaStrong-220#2002 (SerbiaStrong-220#2003)
9f13dba 
Co-authored-by: lzk <[email protected]>
@lapatison @lzk228 @TheArturZh
Translate Upstream SerbiaStrong-220#2008 (SerbiaStrong-220#2009)
eb85b4e 
Co-authored-by: lzk <[email protected]>
@lzk228 @TheArturZh
Add plasma stack sprites (SerbiaStrong-220#2011)
229c7b2
@lapatison @TheArturZh
Locale tweaks (SerbiaStrong-220#2018)
62e9757
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#2036 (SerbiaStrong-220#2037)
5cb1f44
@lapatison @TheArturZh
Locale tweaks (SerbiaStrong-220#2042)
05cdfc7
@MureixloI @TheArturZh
[Resprite] Some brigmedic clothing (SerbiaStrong-220#2043)
d9bc375
@lzk228 @lapatison @TheArturZh
Localize name identifier groups prefix (SerbiaStrong-220#2049)
36835ff 
Co-authored-by: lapatison <[email protected]>
@TheShuEd @Kit0vras
@Morb0 @TheArturZh
IC contraband and staff knowledge of the items (SerbiaStrong-220#1767)
a250de9 
Co-authored-by: Kit0vras <[email protected]>
Co-authored-by: Morb <[email protected]>
@mhamsterr @lzk228 @TheArturZh
[Locale] Ё (SerbiaStrong-220#2051)
95b5c6c 
Co-authored-by: lzk <[email protected]>
@lzk228 @TheArturZh
Locale banners (SerbiaStrong-220#2054)
1003a23
@lapatison @TheArturZh
Freelance radio keycode locale (SerbiaStrong-220#2062)
d7e81f3
@MureixloI @TheArturZh
[Retexture] Inhands briefcase (SerbiaStrong-220#2065)
88e5eb2
@github-actions github-actions bot added Changes: Localization Изменение затронуло файлы ".ftl" Changes: Sprites Изменение затронуло файлы ".rsu / .png" labels Apr 28, 2024
@Kit0vras
Copy link

Халат бригмедика тоже бери, потому что я его всё равно не так как надо сделал и его надо было менять

DexlerXD
DexlerXD approved these changes Apr 29, 2024
View reviewed changes
Copy link

@DexlerXD DexlerXD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...развитие идеи Александра

снят

@DexlerXD DexlerXD merged commit 2c0f3b3 into SerbiaStrong-220:master Apr 29, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DexlerXD DexlerXD DexlerXD approved these changes

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.