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.

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

Upstream2706 #12

Closed

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Jun 27, 2024

Описание PR

Медиа

Проверки

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

Изменения

🆑 Schrodinger71

  • tweak: Upstream 27.06.24, подтянуты коммиты с корвакса.

@github-actions github-actions bot added Changes: UI Изменение интерфейса Changes: Sprites Изменение спрайтов Changes: Map Изменение карт Changes: Localization Изменение локализации labels Jun 27, 2024
@Schrodinger71 Schrodinger71 self-assigned this Jun 27, 2024
Copy link
Contributor

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

Resources/Textures/Effects/ssd.rsi

State Old New Status
default0 Modified

Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi

State Old New Status
icon Modified
icon_open Added

Resources/Textures/Objects/Misc/module.rsi

State Old New Status
cargodisk Modified
datadisk_base Modified
datadisk_label Modified
holodisk Modified
datadisk0 Removed
datadisk1 Removed
datadisk2 Removed
datadisk3 Removed
datadisk4 Removed
datadisk5 Removed
datadisk6 Removed
nucleardisk Removed

Resources/Textures/Objects/Misc/nukedisk.rsi

State Old New Status
icon Modified
inhand-left Added
inhand-right Added

Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi

State Old New Status
freezerOff Modified
freezerOn Modified
freezerPanelOpen Modified
heaterOff Modified
heaterOn Modified
heaterPanelOpen Modified

Resources/Textures/Interface/Alerts/deflecting.rsi

State Old New Status
deflecting0 Removed

Resources/Textures/Objects/Misc/stock_parts.rsi

State Old New Status
datadisk0 Removed
datadisk1 Removed
datadisk2 Removed
datadisk3 Removed
datadisk4 Removed
datadisk5 Removed
datadisk6 Removed

Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi

State Old New Status
bagel-poppy Added
bagel Added

Resources/Textures/Objects/Consumable/Food/ingredients.rsi

State Old New Status
dough-rope Added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов Changes: UI Изменение интерфейса
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant