Rxup / space-station-14

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

[Port]Wonder delta #812

Closed trest100 closed 2 weeks ago

trest100 commented 1 month ago

Описание PR

Перенос карты WonderDelta

Медиа

Тип PR

Изменения

github-actions[bot] commented 1 month ago

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

Resources/Textures/_Ataraxia/Furniture/Altars/Cults/bananium.rsi

| State | Old | New | Status | --- | --- | --- | --- | | full | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Altars/Cults/bananium.rsi/full.png) | Added

Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_bamboo.rsi

| State | Old | New | Status | --- | --- | --- | --- | | left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_bamboo.rsi/left.png) | Added | middle | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_bamboo.rsi/middle.png) | Added | right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_bamboo.rsi/right.png) | Added

Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_wooden.rsi

| State | Old | New | Status | --- | --- | --- | --- | | left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_wooden.rsi/left.png) | Added | middle | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_wooden.rsi/middle.png) | Added | right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_wooden.rsi/right.png) | Added

Resources/Textures/_Ataraxia/Furniture/Benches/pews.rsi

| State | Old | New | Status | --- | --- | --- | --- | | arm_left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/pews.rsi/arm_left.png) | Added | arm_right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/pews.rsi/arm_right.png) | Added | left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/pews.rsi/left.png) | Added | middle | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/pews.rsi/middle.png) | Added | right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/pews.rsi/right.png) | Added

Resources/Textures/_Ataraxia/Furniture/Benches/sofa.rsi

| State | Old | New | Status | --- | --- | --- | --- | | arm_left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa.rsi/arm_left.png) | Added | arm_right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa.rsi/arm_right.png) | Added | corner | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa.rsi/corner.png) | Added | corner_out | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa.rsi/corner_out.png) | Added | left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa.rsi/left.png) | Added | middle | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa.rsi/middle.png) | Added | right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa.rsi/right.png) | Added

Resources/Textures/_Ataraxia/Furniture/Benches/sofa_corp.rsi

| State | Old | New | Status | --- | --- | --- | --- | | arm_left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa_corp.rsi/arm_left.png) | Added | arm_right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa_corp.rsi/arm_right.png) | Added | corner | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa_corp.rsi/corner.png) | Added | corner_out | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa_corp.rsi/corner_out.png) | Added | left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa_corp.rsi/left.png) | Added | middle | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa_corp.rsi/middle.png) | Added | right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/sofa_corp.rsi/right.png) | Added

Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench.rsi

| State | Old | New | Status | --- | --- | --- | --- | | left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench.rsi/left.png) | Added | middle | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench.rsi/middle.png) | Added | right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench.rsi/right.png) | Added

Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench_white.rsi

| State | Old | New | Status | --- | --- | --- | --- | | left | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench_white.rsi/left.png) | Added | middle | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench_white.rsi/middle.png) | Added | right | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench_white.rsi/right.png) | Added

Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi

| State | Old | New | Status | --- | --- | --- | --- | | full | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi/full.png) | Added | state_0 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi/state_0.png) | Added | state_1 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi/state_1.png) | Added | state_2 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi/state_2.png) | Added | state_3 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi/state_3.png) | Added | state_4 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi/state_4.png) | Added | state_5 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi/state_5.png) | Added | state_6 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi/state_6.png) | Added | state_7 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi/state_7.png) | Added

Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi

| State | Old | New | Status | --- | --- | --- | --- | | base | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/base.png) | Added | book-0 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-0.png) | Added | book-1 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-1.png) | Added | book-10 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-10.png) | Added | book-11 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-11.png) | Added | book-12 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-12.png) | Added | book-13 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-13.png) | Added | book-14 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-14.png) | Added | book-15 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-15.png) | Added | book-16 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-16.png) | Added | book-17 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-17.png) | Added | book-18 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-18.png) | Added | book-19 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-19.png) | Added | book-2 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-2.png) | Added | book-20 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-20.png) | Added | book-3 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-3.png) | Added | book-4 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-4.png) | Added | book-5 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-5.png) | Added | book-6 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-6.png) | Added | book-7 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-7.png) | Added | book-8 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-8.png) | Added | book-9 | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/book-9.png) | Added | empty | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/empty.png) | Added | smooth | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi/smooth.png) | Added

Resources/Textures/_Ataraxia/Furniture/furniture.rsi

| State | Old | New | Status | --- | --- | --- | --- | | dresser | ![]() | ![](https://raw.githubusercontent.com/trest100/space-station-14/42c6b7e102950ef5c125e7399f0c23479223520b/Resources/Textures/_Ataraxia/Furniture/furniture.rsi/dresser.png) | Added

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 3 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 2 weeks ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.