Rxup / space-station-14

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

[Feature] Upstream Sync 17.09.24 #753

Closed Roudenn closed 1 month ago

Roudenn commented 1 month ago

Цель на пистолет ГСБ была убрана т. к. сам пистолет не доступен в обычной игре и ему уже есть аналог в виде дробовика ГСБ. Также агентам Горлакса может выпасть цель на кражу диска

github-actions[bot] commented 1 month ago

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

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

| State | Old | New | Status | --- | --- | --- | --- | | produce | ![](https://raw.githubusercontent.com/Rxup/space-station-14/83817f48d18327affeeb4bee9b5ec200e3c751a0/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png) | Modified

Resources/Textures/Structures/Specific/anomaly.rsi

| State | Old | New | Status | --- | --- | --- | --- | | anom5-pulse | ![](https://raw.githubusercontent.com/Rxup/space-station-14/83817f48d18327affeeb4bee9b5ec200e3c751a0/Resources/Textures/Structures/Specific/anomaly.rsi/anom5-pulse.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/anomaly.rsi/anom5-pulse.png) | Modified | anom5 | ![](https://raw.githubusercontent.com/Rxup/space-station-14/83817f48d18327affeeb4bee9b5ec200e3c751a0/Resources/Textures/Structures/Specific/anomaly.rsi/anom5.png) | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/anomaly.rsi/anom5.png) | Modified

Resources/Textures/Clothing/Head/Hoods/voidcloak.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Clothing/Head/Hoods/voidcloak.rsi/equipped-HELMET.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Clothing/Head/Hoods/voidcloak.rsi/icon.png) | Added

Resources/Textures/Mobs/Customization/gauze.rsi

| State | Old | New | Status | --- | --- | --- | --- | | gauze_head | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_head.png) | Added

Resources/Textures/Mobs/Pets/corgi.rsi

| State | Old | New | Status | --- | --- | --- | --- | | real_mouse | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse.png) | Added | real_mouse_dead | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse_dead.png) | Added

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

| State | Old | New | Status | --- | --- | --- | --- | | skewer-holymelon | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-holymelon.png) | Added

Resources/Textures/Objects/Devices/encryption_keys.rsi

| State | Old | New | Status | --- | --- | --- | --- | | borg_label | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png) | Added

Resources/Textures/Objects/Fun/toys.rsi

| State | Old | New | Status | --- | --- | --- | --- | | rubber_chicken | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png) | Added

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

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

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

| State | Old | New | Status | --- | --- | --- | --- | | dead | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/dead.png) | Added | harvest | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/harvest.png) | Added | produce | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/produce.png) | Added | seed | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/seed.png) | Added | slice | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/slice.png) | Added | stage-1 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-1.png) | Added | stage-2 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-2.png) | Added | stage-3 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-3.png) | Added | stage-4 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-4.png) | Added | stage-5 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-5.png) | Added | stage-6 | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Objects/Specific/Hydroponics/holymelon.rsi/stage-6.png) | Added

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

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

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

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

Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi

| State | Old | New | Status | --- | --- | --- | --- | | broken | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png) | Added | deny-unshaded | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png) | Added | normal-unshaded | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png) | Added | off | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png) | Added | panel | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png) | Added

Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi

| State | Old | New | Status | --- | --- | --- | --- | | bluespace | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace.png) | Added | bluespace_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_VOX.png) | Added | fire | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire.png) | Added | fire_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_VOX.png) | Added | flesh | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh.png) | Added | flesh_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_VOX.png) | Added | flora | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora.png) | Added | flora_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_VOX.png) | Added | frost | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost.png) | Added | frost_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_VOX.png) | Added | grav | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav.png) | Added | grav_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_VOX.png) | Added | rock | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock.png) | Added | rock_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_VOX.png) | Added | shadow | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow.png) | Added | shadow_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_VOX.png) | Added | shock | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock.png) | Added | shock_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_VOX.png) | Added | tech | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech.png) | Added | tech_VOX | ![]() | ![](https://raw.githubusercontent.com/Roudenn/space-station-14/d957daf4cce5453f6e4cb7e6690fc823306e3e94/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_VOX.png) | Added