Rxup / space-station-14

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

Upstream sync #719

Closed Rxup closed 2 months ago

github-actions[bot] commented 2 months ago

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

Resources/Textures/Clothing/Head/Helmets/security.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET-vox | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png) | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png) | Modified

Resources/Textures/Clothing/OuterClothing/Armor/security.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING-vox | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png) | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png) | Modified | inhand-left | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png) | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png) | Modified | inhand-right | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png) | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png) | Modified

Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING-monkey | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png) | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png) | Modified | equipped-INNERCLOTHING | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png) | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png) | Modified | icon | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png) | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png) | Modified | inhand-left | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png) | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png) | Modified | inhand-right | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png) | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png) | Modified

Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-INNERCLOTHING-monkey | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png) | ![]() | Removed | equipped-INNERCLOTHING | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png) | ![]() | Removed | icon | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png) | ![]() | Removed | inhand-left | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png) | ![]() | Removed | inhand-right | ![](https://raw.githubusercontent.com/Rxup/space-station-14/fd4ef445bbec60741308bc558d4e6611ca16147b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png) | ![]() | Removed

Resources/Textures/Objects/Tools/crowbar.rsi

| State | Old | New | Status | --- | --- | --- | --- | | red-icon | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/b17204d1ad2e5177369b79a10309d5fc28623c3e/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png) | Added

Edit: diff updated after b17204d1ad2e5177369b79a10309d5fc28623c3e