Rxup / space-station-14

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

[Port] EE Plushie & Xenowears #751

Closed PuroSlavKing closed 1 month ago

PuroSlavKing commented 1 month ago

Описание PR

Медиа

image

Тип PR

Изменения

:cl: PuroSlavKing

github-actions[bot] commented 1 month ago

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

Resources/Textures/_EinsteinEngines/Clothing/Neck/Misc/bellcollar.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Neck/Misc/bellcollar.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Neck/Misc/bellcollar.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Neck/Misc/bellcollar.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Neck/Misc/bellcollar.rsi/inhand-right.png) | Added

Resources/Textures/_EinsteinEngines/Clothing/Neck/mantles/oldmantle.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Neck/mantles/oldmantle.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Neck/mantles/oldmantle.rsi/icon.png) | Added

Resources/Textures/_EinsteinEngines/Clothing/Neck/mantles/unathimantle.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-NECK | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Neck/mantles/unathimantle.rsi/equipped-NECK.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Neck/mantles/unathimantle.rsi/icon.png) | Added

Resources/Textures/_EinsteinEngines/Clothing/OuterClothing/Misc/unathirobe.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/OuterClothing/Misc/unathirobe.rsi/equipped-OUTERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/OuterClothing/Misc/unathirobe.rsi/icon.png) | Added

Resources/Textures/_EinsteinEngines/Clothing/Shoes/Misc/clothWrap.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-FEET | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Shoes/Misc/clothWrap.rsi/equipped-FEET.png) | Added | equipped-HAND | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Shoes/Misc/clothWrap.rsi/equipped-HAND.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Clothing/Shoes/Misc/clothWrap.rsi/icon.png) | Added

Resources/Textures/_EinsteinEngines/Objects/Fun/catplushie.rsi

| State | Old | New | Status | --- | --- | --- | --- | | black | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/catplushie.rsi/black.png) | Added | grey | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/catplushie.rsi/grey.png) | Added | orange | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/catplushie.rsi/orange.png) | Added | siames | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/catplushie.rsi/siames.png) | Added | tabby | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/catplushie.rsi/tabby.png) | Added | tuxedo | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/catplushie.rsi/tuxedo.png) | Added | white | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/catplushie.rsi/white.png) | Added

Resources/Textures/_EinsteinEngines/Objects/Fun/corgiplushie.rsi

| State | Old | New | Status | --- | --- | --- | --- | | corgi | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/corgiplushie.rsi/corgi.png) | Added | girlycorgi | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/corgiplushie.rsi/girlycorgi.png) | Added | robotcorgi | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/corgiplushie.rsi/robotcorgi.png) | Added

Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi

| State | Old | New | Status | --- | --- | --- | --- | | black | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi/black.png) | Added | blue | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi/blue.png) | Added | coffee | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi/coffee.png) | Added | crimson | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi/crimson.png) | Added | marble | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi/marble.png) | Added | orange | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi/orange.png) | Added | pink | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi/pink.png) | Added | purple | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi/purple.png) | Added | red | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/foxplushie.rsi/red.png) | Added

Resources/Textures/_EinsteinEngines/Objects/Fun/petrock.rsi

| State | Old | New | Status | --- | --- | --- | --- | | fred | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/petrock.rsi/fred.png) | Added | rock | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/petrock.rsi/rock.png) | Added | roxie | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/petrock.rsi/roxie.png) | Added

Resources/Textures/_EinsteinEngines/Objects/Fun/prizeticket.rsi

| State | Old | New | Status | --- | --- | --- | --- | | prizeball | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/prizeticket.rsi/prizeball.png) | Added | ticket | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/prizeticket.rsi/ticket.png) | Added | ticket_2 | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/prizeticket.rsi/ticket_2.png) | Added | ticket_3 | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/prizeticket.rsi/ticket_3.png) | Added | ticket_4 | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/prizeticket.rsi/ticket_4.png) | Added

Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi

| State | Old | New | Status | --- | --- | --- | --- | | abductor | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/abductor.png) | Added | abductor_agent | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/abductor_agent.png) | Added | deer | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/deer.png) | Added | gnome | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/gnome.png) | Added | grey | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/grey.png) | Added | ipc | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/ipc.png) | Added | loveable | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/loveable.png) | Added | plushie_arachne | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/plushie_arachne.png) | Added | plushie_jester | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/plushie_jester.png) | Added | plushie_slips | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/plushie_slips.png) | Added | plushie_trystan | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/plushie_trystan.png) | Added | plushie_vulp | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Fun/toys.rsi/plushie_vulp.png) | Added

Resources/Textures/_EinsteinEngines/Objects/Storage/Happyhonk/rock_carrier.rsi

| State | Old | New | Status | --- | --- | --- | --- | | box-inhand-left | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-left.png) | Added | box-inhand-right | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Storage/Happyhonk/rock_carrier.rsi/box-inhand-right.png) | Added | box-open | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Storage/Happyhonk/rock_carrier.rsi/box-open.png) | Added | box | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Objects/Storage/Happyhonk/rock_carrier.rsi/box.png) | Added

Resources/Textures/_EinsteinEngines/Structures/Machines/prizecounter.rsi

| State | Old | New | Status | --- | --- | --- | --- | | icon | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Structures/Machines/prizecounter.rsi/icon.png) | Added | panel | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Structures/Machines/prizecounter.rsi/panel.png) | Added | unlit | ![]() | ![](https://raw.githubusercontent.com/Rxup/space-station-14/a38a9fe76e9369ade726109d6c3b1231b3fba037/Resources/Textures/_EinsteinEngines/Structures/Machines/prizecounter.rsi/unlit.png) | Added

Edit: diff updated after a38a9fe76e9369ade726109d6c3b1231b3fba037

PuroSlavKing commented 1 month ago
Error: /Prototypes/_EinsteinEngines/Entities/Objects/Fun/toys.yml(261,13)  File not found. (/Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg)
Error: /Prototypes/_EinsteinEngines/Entities/Objects/Fun/prizeticket.yml(114,13)  No EntityPrototype found with id PlushieMothRandom
Error: /Prototypes/_EinsteinEngines/Entities/Objects/Fun/prizeticket.yml(11[7](https://github.com/Rxup/space-station-14/actions/runs/10885967447/job/30204819780?pr=751#step:9:8),13)  No EntityPrototype found with id PlushieMothMusician
Error: /Prototypes/_EinsteinEngines/Entities/Objects/Fun/prizeticket.yml(120,13)  No EntityPrototype found with id PlushieMothBartender
Error: /Prototypes/_EinsteinEngines/Recipes/Lathes/prizecounter.yml(11,11)  No EntityPrototype found with id PlushieMothRandom
Error: /Prototypes/_EinsteinEngines/Recipes/Lathes/prizecounter.yml(1[9](https://github.com/Rxup/space-station-14/actions/runs/10885967447/job/30204819780?pr=751#step:9:10),11)  No EntityPrototype found with id PlushieMothMusician
Error: /Prototypes/_EinsteinEngines/Recipes/Lathes/prizecounter.yml(27,11)  No EntityPrototype found with id PlushieMothBartender
Error: /Prototypes/_EinsteinEngines/Stacks/prizeticket.yml(7,3)  Field "itemSize" not found in "Content.Shared.Stacks.StackPrototype".

Не привычно наличие автоматического линтера 😭