Upstream2706

[Schrodinger71]

Описание PR

Проверки

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

Изменения

:cl: Schrodinger71

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

[github-actions[bot]]

RSI Diff Bot; head commit cc884b39e1d3158ec70f772d9304b9763e894f48 merging into 68438faa10450504fb8b0cd7fc7e1092f086f485 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

Edit: diff updated after cc884b39e1d3158ec70f772d9304b9763e894f48