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 22 #543

Merged
merged 19 commits into from
Nov 28, 2023
Merged

Corvax cherry pick 22 #543

merged 19 commits into from
Nov 28, 2023

Conversation

TheArturZh
Copy link
Member

Описание PR

Черрипик переводов, ретекстуров и фиксов контента с корвакса. Включает долгожданный респрайт медика оперативников от Hqlle
ПРы:
space-syndicate/space-station-14#1592
space-syndicate/space-station-14#1591
space-syndicate/space-station-14#1584
space-syndicate/space-station-14#1583
space-syndicate/space-station-14#1582
space-syndicate/space-station-14#1575
space-syndicate/space-station-14#1572
space-syndicate/space-station-14#1571
space-syndicate/space-station-14#1567
space-syndicate/space-station-14#1563
space-syndicate/space-station-14#1562
space-syndicate/space-station-14#1561
space-syndicate/space-station-14#1560
space-syndicate/space-station-14#1556
space-syndicate/space-station-14#1553
space-syndicate/space-station-14#1539
space-syndicate/space-station-14#1536
space-syndicate/space-station-14#1535
space-syndicate/space-station-14#1533

Медиа

Проверки

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

Изменения

🆑

  • add: Подтянуты фиксы, ретекстуры и переводы с Корвакса

lapatison and others added 19 commits November 28, 2023 18:24
@lapatison @TheArturZh
Translate SerbiaStrong-220#1532 (SerbiaStrong-220#1533)
9f6a4e3
@lzk228 @TheArturZh
Lil diona names expansion (SerbiaStrong-220#1535)
a703096
@lapatison @TheArturZh
Upstream SerbiaStrong-220#1532 locale Patch (SerbiaStrong-220#1536)
963137b
@lzk228 @TheArturZh
Slurred accent tweaks (SerbiaStrong-220#1539)
fdac2dd
@lapatison @lzk228 @TheArturZh
Translate Upstream SerbiaStrong-220#1552 (SerbiaStrong-220#1553)
a99b5a6 
Co-authored-by: lzk <[email protected]>
@lapatison @TheArturZh
Locale fix (SerbiaStrong-220#1556)
5c3a968
@lzk228 @TheArturZh
[Resprite] Localize some signs (SerbiaStrong-220#1560)
d3b9916
@lzk228 @TheArturZh
Update shaker description (SerbiaStrong-220#1561)
801d572
@SonicHDC @TheArturZh
Diagonal walls resprite (SerbiaStrong-220#1562)
78ff786
@SonicHDC @TheArturZh
Smooth diagonal windows to walls (SerbiaStrong-220#1563)
e2cfe5e
@lapatison @lzk228 @TheArturZh
Translate Upstream SerbiaStrong-220#1559 (SerbiaStrong-220#1567)
4fca095 
Co-authored-by: lzk <[email protected]>
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#1570 (SerbiaStrong-220#1571)
a1b9ed1
@lapatison @TheArturZh
Locale fix (SerbiaStrong-220#1572)
d048323
@lzk228 @TheArturZh
Update playtime-stats.ftl (SerbiaStrong-220#1575)
1870508
@Hqlle @TheArturZh
[Resprite] Nuke medic (SerbiaStrong-220#1582)
ea02710
@lzk228 @Morb0
@lapatison @TheArturZh
Translate Upstream SerbiaStrong-220#1580 (SerbiaStrong-220#1583)
db65305 
Co-authored-by: Morb <[email protected]>
Co-authored-by: lapatison <[email protected]>
@lzk228 @TheArturZh
Give IAA lawyer access (SerbiaStrong-220#1584)
acf8840
@LinkF2kkk @TheArturZh
[Resprite] Senior roles (SerbiaStrong-220#1591)
176acd1
@lzk228 @TheArturZh
Minor loc fixes (SerbiaStrong-220#1592)
67dd9bd
@github-actions github-actions bot added Changes: Localization Изменение затронуло файлы ".ftl" Changes: Sprites Изменение затронуло файлы ".rsu / .png" labels Nov 28, 2023
@github-actions GitHub Actions
Copy link

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

Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi

State Old New Status
icon-flash Modified
icon Modified
off-equipped-HELMET Modified
off-inhand-left Modified
off-inhand-right Modified
on-equipped-HELMET Modified
on-inhand-left Modified
on-inhand-right Modified

Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi

State Old New Status
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi

State Old New Status
equipped-HELMET-hamster Modified
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi

State Old New Status
equipped-HELMET-hamster Modified
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Head/Hats/beret_security.rsi

State Old New Status
equipped-HELMET-hamster Modified
equipped-HELMET Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon-open Modified
icon Modified
inhand-left Modified
inhand-right Modified
open-equipped-OUTERCLOTHING Modified
open-inhand-left Modified
open-inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon-open Modified
icon Modified
inhand-left Modified
inhand-right Modified
open-equipped-OUTERCLOTHING Modified
open-inhand-left Modified
open-inhand-right Modified

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi

State Old New Status
equipped-OUTERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Modified
equipped-INNERCLOTHING Modified
icon Modified
inhand-left Modified
inhand-right Modified

Resources/Textures/Structures/Wallmounts/signs.rsi

State Old New Status
court Modified
janitor Modified
law Modified
psychology Modified

Resources/Textures/Structures/Walls/solid_diagonal.rsi

State Old New Status
state0 Modified
state1 Modified

Resources/Textures/Structures/Windows/plasma_diagonal.rsi

State Old New Status
state0 Modified
state1 Modified

Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi

State Old New Status
state0 Modified
state1 Modified

Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi

State Old New Status
state0 Modified
state1 Modified

Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi

State Old New Status
state0 Modified
state1 Modified

Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi

State Old New Status
state0 Modified
state1 Modified

Resources/Textures/Structures/Windows/window_diagonal.rsi

State Old New Status
state0 Modified
state1 Modified

@DexlerXD DexlerXD merged commit 8c1f9e4 into SerbiaStrong-220:master Nov 28, 2023
14 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.
7 participants
@TheArturZh @DexlerXD @lapatison @lzk228 @SonicHDC @Hqlle @LinkF2kkk