search

Rxup / space-station-14

🚀 Билд русскоязычного сервера Space Station 14
GNU Affero General Public License v3.0
47 stars 143 forks source link

[Tweak] Upstream sync #790

Closed Roudenn closed 1 month ago

Roudenn commented 1 month ago

НЕДОПИЛЕНО!!!!! надо замёрджить Корвухов правильно + пофиксить noSpawn Также оффы меняли настройки для проверок, потому после нужных фиксов они могут всё равно сломаться

github-actions[bot] commented 1 month ago

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

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png) | Added

Resources/Textures/Decals/burnt.rsi

| State | Old | New | Status | --- | --- | --- | --- | | burnt1 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Decals/burnt.rsi/burnt1.png) | Added | burnt2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Decals/burnt.rsi/burnt2.png) | Added | burnt3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Decals/burnt.rsi/burnt3.png) | Added | burnt4 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Decals/burnt.rsi/burnt4.png) | Added

Resources/Textures/Objects/Devices/cartridge.rsi

| State | Old | New | Status | --- | --- | --- | --- | | cart-sec | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Objects/Devices/cartridge.rsi/cart-sec.png) | Added

Resources/Textures/Objects/Misc/stamps.rsi

| State | Old | New | Status | --- | --- | --- | --- | | stamp-psychologist | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Objects/Misc/stamps.rsi/stamp-psychologist.png) | Added

Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi

| State | Old | New | Status | --- | --- | --- | --- | | dead | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png) | Added | harvest | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png) | Added | produce | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce.png) | Added | seed | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/seed.png) | Added | stage-1 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png) | Added | stage-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png) | Added

Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-SUITSTORAGE | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/equipped-SUITSTORAGE.png) | Added

Resources/Textures/Structures/Machines/computers.rsi

| State | Old | New | Status | --- | --- | --- | --- | | generic_panel_open | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/833b61699dd8f7059e916bbe9cd513ec2bb0aac8/Resources/Textures/Structures/Machines/computers.rsi/generic_panel_open.png) | Added

Edit: diff updated after 833b61699dd8f7059e916bbe9cd513ec2bb0aac8