forked from AdventureTimeSS14/space_station_ADT
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Добавление новых стен (AdventureTimeSS14#395)
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> Коммит взят отсюда: crystallpunk-14/crystall-punk-14@6307c1b **Ссылка на публикацию в Discord** <!-- Укажите ссылки на соответствующие обсуждения, проблемы, баги, заказы в разработку или предложения Если ссылки отсутствуют или этот PR ваша личная инициатива, данный раздел описания можно удалить. --> - [Заказы-разработка](https://discord.com/channels/901772674865455115/1232912408419504260) **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ian --> 🆑 Хурмик - add: Новые стены для мапперов и ивентеров: картонная, каменная и кирпичная жёлтая стена
- Loading branch information
Showing
33 changed files
with
196 additions
and
3 deletions.
There are no files selected for viewing
8 changes: 7 additions & 1 deletion
8
Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Walls/walls.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,10 @@ | ||
ent-ADTSpaceSecWall = укреплённая стена | ||
.desc = Удерживает воздух внутри, а дронов снаружи. | ||
ent-ADTSpaceSecWallDiagonal = диагональная укреплённая стена | ||
.desc = Удерживает воздух внутри, а дронов снаружи. | ||
.desc = Удерживает воздух внутри, а дронов снаружи. | ||
ent-ADTCardboardWall = картонная стена | ||
.desc = Стена из бумаги и тонких досок. Пользуется определенной популярностью в [восточном месте]. | ||
ent-ADTStonebrickWall = каменная стена | ||
.desc = Классическая каменная стена. | ||
ent-ADTYellowbrickWall = кирпичная жёлтая стена | ||
.desc = Желтые кирпичи, уложенные по древним обычаям. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить | ||
# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить | ||
Тут уже не было Хурмика |
Binary file added
BIN
+758 Bytes
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+623 Bytes
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+758 Bytes
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+623 Bytes
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+628 Bytes
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+421 Bytes
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+628 Bytes
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+259 Bytes
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/cardboard7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+487 Bytes
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions
46
Resources/Textures/ADT/Structures/Walls/cardboard_walls.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC0-1.0", | ||
"copyright": "By jaraten(discord)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "full" | ||
}, | ||
{ | ||
"name": "cardboard0", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "cardboard1", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "cardboard2", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "cardboard3", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "cardboard4", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "cardboard5", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "cardboard6", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "cardboard7", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+814 Bytes
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions
46
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC0-1.0", | ||
"copyright": "By jaraten(discord)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "full" | ||
}, | ||
{ | ||
"name": "stonebricks0", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "stonebricks1", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "stonebricks2", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "stonebricks3", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "stonebricks4", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "stonebricks5", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "stonebricks6", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "stonebricks7", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+1.19 KB
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+923 Bytes
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.21 KB
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+921 Bytes
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+922 Bytes
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+671 Bytes
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+914 Bytes
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+257 Bytes
Resources/Textures/ADT/Structures/Walls/stone_bricks_wall.rsi/stonebricks7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+712 Bytes
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions
46
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC0-1.0", | ||
"copyright": "By jaraten(discord)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "full" | ||
}, | ||
{ | ||
"name": "yellowbricks0", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "yellowbricks1", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "yellowbricks2", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "yellowbricks3", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "yellowbricks4", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "yellowbricks5", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "yellowbricks6", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "yellowbricks7", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+1.08 KB
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+824 Bytes
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.06 KB
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+825 Bytes
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+864 Bytes
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+567 Bytes
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+850 Bytes
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks6.png
Oops, something went wrong.
Binary file added
BIN
+258 Bytes
Resources/Textures/ADT/Structures/Walls/yellow_bricks_wall.rsi/yellowbricks7.png
Oops, something went wrong.