Rxup / space-station-14

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

[Tweak] Upstream sync #866

Closed Roudenn closed 1 week ago

Roudenn commented 1 week ago

скучнейший апстрим в котором только баг фиксы и обновления карт

github-actions[bot] commented 1 week ago

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

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

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png) | Modified | icon | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png) | Modified | inhand-left | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png) | Modified | inhand-right | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png) | Modified

Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING-monkey | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png) | Modified | equipped-INNERCLOTHING | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png) | Modified | icon | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png) | Modified | inhand-left | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png) | Modified | inhand-right | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png) | Modified | equipped-INNERCLOTHING-reptilian | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-reptilian.png) | Added

Resources/Textures/Objects/Devices/ai_card.rsi

| State | Old | New | Status | --- | --- | --- | --- | | base | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Devices/ai_card.rsi/base.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Devices/ai_card.rsi/base.png) | Modified | empty | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Devices/ai_card.rsi/empty.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Devices/ai_card.rsi/empty.png) | Modified | full | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Devices/ai_card.rsi/full.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Devices/ai_card.rsi/full.png) | Modified

Resources/Textures/Objects/Specific/Chemistry/syringe.rsi

| State | Old | New | Status | --- | --- | --- | --- | | syringeproj | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringeproj.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/syringeproj.png) | Modified | minisyringe1 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/minisyringe1.png) | Added | minisyringe2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/minisyringe2.png) | Added | minisyringe3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/minisyringe3.png) | Added

Resources/Textures/Objects/Tools/appraisal-tool.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-BELT | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Tools/appraisal-tool.rsi/equipped-BELT.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Tools/appraisal-tool.rsi/equipped-BELT.png) | Modified | inhand-left | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Tools/appraisal-tool.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Tools/appraisal-tool.rsi/inhand-right.png) | Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi

| State | Old | New | Status | --- | --- | --- | --- | | mag-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-1.png) | Modified | magb-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-1.png) | Modified | mag-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-2.png) | Added | mag-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/mag-3.png) | Added | magb-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-2.png) | Added | magb-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/magb-3.png) | Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi

| State | Old | New | Status | --- | --- | --- | --- | | mag-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png) | Modified | mag10-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png) | Modified | magb-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png) | Modified | mag-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-2.png) | Added | mag-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-3.png) | Added | mag10-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-2.png) | Added | mag10-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-3.png) | Added | magb-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-2.png) | Added | magb-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-3.png) | Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi

| State | Old | New | Status | --- | --- | --- | --- | | mag-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-1.png) | Modified | magb-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-1.png) | Modified | mag-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-2.png) | Added | mag-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/mag-3.png) | Added | magb-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-2.png) | Added | magb-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/magb-3.png) | Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi

| State | Old | New | Status | --- | --- | --- | --- | | mag-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png) | Modified | mag-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-2.png) | Added | mag-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-3.png) | Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi

| State | Old | New | Status | --- | --- | --- | --- | | mag-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png) | Modified | mag-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-2.png) | Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi

| State | Old | New | Status | --- | --- | --- | --- | | mag-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png) | Modified | magb-1 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b5e913c9f818f72ad9b145c9c025a814233254f9/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png) | Modified | mag-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-2.png) | Added | mag-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-3.png) | Added | magb-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-2.png) | Added | magb-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-3.png) | Added

Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi

| State | Old | New | Status | --- | --- | --- | --- | | inhand-left | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/inhand-right.png) | Added | syringe_gun | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/a141027bcf65a67458221a13907c034a8ec19f7f/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/syringe_gun.png) | Added