search

space-syndicate / space-station-14

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

[MAPS] Paper fix #2316

Closed XsenonDash closed 1 month ago

XsenonDash commented 1 month ago

Описание PR

Исправления

Медиа

Проверки

Изменения

:cl: TiFeRi

github-actions[bot] commented 1 month ago

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

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png) | Modified | icon-open | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon-open.png) | Modified | icon | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png) | Modified | open-equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-equipped-OUTERCLOTHING.png) | Modified

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING.png) | Modified | icon-open | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon-open.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon-open.png) | Modified | icon | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/icon.png) | Modified | open-equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING.png) | Modified

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/equipped-OUTERCLOTHING.png) | Modified | icon-open | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon-open.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon-open.png) | Modified | icon | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/icon.png) | Modified | open-equipped-OUTERCLOTHING | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi/open-equipped-OUTERCLOTHING.png) | Modified

Resources/Textures/Structures/Furniture/Tables/counterwood.rsi

| State | Old | New | Status | --- | --- | --- | --- | | state_0 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Furniture/Tables/counterwood.rsi/state_0.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Furniture/Tables/counterwood.rsi/state_0.png) | Modified | state_2 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Furniture/Tables/counterwood.rsi/state_2.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Furniture/Tables/counterwood.rsi/state_2.png) | Modified | state_5 | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Furniture/Tables/counterwood.rsi/state_5.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Furniture/Tables/counterwood.rsi/state_5.png) | Modified

Resources/Textures/Structures/Power/substation.rsi

| State | Old | New | Status | --- | --- | --- | --- | | charging | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Power/substation.rsi/charging.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Power/substation.rsi/charging.png) | Modified | dead | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Power/substation.rsi/dead.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Power/substation.rsi/dead.png) | Modified | full | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Power/substation.rsi/full.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Power/substation.rsi/full.png) | Modified | screen | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Power/substation.rsi/screen.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Power/substation.rsi/screen.png) | Modified | screen_wall | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Power/substation.rsi/screen_wall.png) | Modified | substation | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Power/substation.rsi/substation.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Power/substation.rsi/substation.png) | Modified | substation_static | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Power/substation.rsi/substation_static.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Power/substation.rsi/substation_static.png) | Modified | substation_wall | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Power/substation.rsi/substation_wall.png) | Modified | substation_wall_static | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png) | Modified

Resources/Textures/Structures/Wallmounts/posters.rsi

| State | Old | New | Status | --- | --- | --- | --- | | poster9_legit | ![](https://raw.githubusercontent.com/space-syndicate/space-station-14/fd7c530fae8cbee40c5ae5f3dcc68f2f67e373ba/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_legit.png) | ![](https://raw.githubusercontent.com/XsenonDash/space-station-14/2861b0c2f4788b3c9b4df4e312d4ea80d6b517fc/Resources/Textures/Structures/Wallmounts/posters.rsi/poster9_legit.png) | Modified

github-actions[bot] commented 1 month ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.