search

space-syndicate / space-station-14

🚀 Билд первого русскоязычного сервера Space Station 14
https://discord.ss14.ru
MIT License
162 stars 500 forks source link

Upstream sync #2347

Closed Morb0 closed 1 week ago

Morb0 commented 1 week ago

Описание PR

Медиа

Проверки

Изменения

github-actions[bot] commented 1 week ago

RSI Diff Bot; head commit 5dd4169689ee6b49ea185bc342c1c1d897e73743 merging into 11e2a963b2c69c638e6c00ec2c95fb18b65e79b7 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 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Effects/ssd.rsi/default0.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Effects/ssd.rsi/default0.png) | Modified

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

| State | Old | New | Status | --- | --- | --- | --- | | icon | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon.png) | Modified | icon_open | ![]() | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/icon_open.png) | Added

Resources/Textures/Objects/Misc/module.rsi

| State | Old | New | Status | --- | --- | --- | --- | | cargodisk | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png) | Modified | datadisk_base | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png) | Modified | datadisk_label | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png) | Modified | holodisk | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/holodisk.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Misc/module.rsi/holodisk.png) | Modified | datadisk0 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png) | ![]() | Removed | datadisk1 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png) | ![]() | Removed | datadisk2 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png) | ![]() | Removed | datadisk3 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png) | ![]() | Removed | datadisk4 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png) | ![]() | Removed | datadisk5 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png) | ![]() | Removed | datadisk6 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png) | ![]() | Removed | nucleardisk | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png) | ![]() | Removed

Resources/Textures/Objects/Misc/nukedisk.rsi

| State | Old | New | Status | --- | --- | --- | --- | | icon | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png) | Modified | inhand-left | ![]() | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-right.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | freezerOff | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOff.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOff.png) | Modified | freezerOn | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOn.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerOn.png) | Modified | freezerPanelOpen | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerPanelOpen.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/freezerPanelOpen.png) | Modified | heaterOff | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOff.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOff.png) | Modified | heaterOn | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOn.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterOn.png) | Modified | heaterPanelOpen | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterPanelOpen.png) | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Structures/Piping/Atmospherics/thermomachine.rsi/heaterPanelOpen.png) | Modified

Resources/Textures/Interface/Alerts/deflecting.rsi

| State | Old | New | Status | --- | --- | --- | --- | | deflecting0 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png) | ![]() | Removed

Resources/Textures/Objects/Misc/stock_parts.rsi

| State | Old | New | Status | --- | --- | --- | --- | | datadisk0 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png) | ![]() | Removed | datadisk1 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png) | ![]() | Removed | datadisk2 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png) | ![]() | Removed | datadisk3 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png) | ![]() | Removed | datadisk4 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png) | ![]() | Removed | datadisk5 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png) | ![]() | Removed | datadisk6 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/11e2a963b2c69c638e6c00ec2c95fb18b65e79b7/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png) | ![]() | Removed

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

| State | Old | New | Status | --- | --- | --- | --- | | bagel-poppy | ![]() | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-poppy.png) | Added | bagel | ![]() | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | dough-rope | ![]() | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/5dd4169689ee6b49ea185bc342c1c1d897e73743/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/dough-rope.png) | Added