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#439) <!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> Теперь плащ пустоты обладает капюшоном пустоты, скрывая личность обладателя Перенос скафандра инквизитора со старой сборки **Ссылка на публикацию в Discord** <!-- Укажите ссылки на соответствующие обсуждения, проблемы, баги, заказы в разработку или предложения Если ссылки отсутствуют или этот PR ваша личная инициатива, данный раздел описания можно удалить. --> - [Заказы-разработка](https://discord.com/channels/901772674865455115/1279597587204149331) - [Перенос контента](https://discord.com/channels/901772674865455115/1282512571546472498) **Медиа** <!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если ваш PR представляет собой визуальное изменение, добавьте скриншоты, иначе он может быть закрыт. --> ![image](https://github.com/user-attachments/assets/c762e244-e0a5-4bf1-9775-145f39f6c8ec) Execute order 66 ![image](https://github.com/user-attachments/assets/98142039-223a-42e4-8dac-0cfc20dca404) **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ian --> 🆑 - add: НТ расширила финансирование инквизиционного трибунала и теперь сотрудникам инквизиции выдаются отдельные скафандры. Слава НТ! - add: Неизвестные теперь начали пришивать к плащу пустоты, капюшон, который скрывает облик владельца. Слава неизвестным!
- Loading branch information
Showing
20 changed files
with
171 additions
and
4 deletions.
There are no files selected for viewing
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
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hoods.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 |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTClothingNeckVoidCloakHatHood = капюшон пустоты | ||
.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
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,21 @@ | ||
- type: entity | ||
parent: ClothingHeadBase | ||
id: ADTClothingNeckVoidCloakHatHood | ||
categories: [ HideSpawnMenu ] | ||
name: hood of the void | ||
description: wearing it, you feel the illusion of security | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Head/hoods/hoods_void_cloak.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Head/hoods/hoods_void_cloak.rsi | ||
- type: IdentityBlocker | ||
- type: Tag | ||
tags: | ||
- WhitelistChameleon | ||
- type: HideLayerClothing | ||
slots: | ||
- Hair | ||
- Snout | ||
- HeadTop | ||
- HeadSide |
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
Binary file added
BIN
+371 Bytes
Resources/Textures/ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi/icon-flash.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
+371 Bytes
Resources/Textures/ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions
33
Resources/Textures/ADT/Clothing/Head/Hardsuits/inquisitoryhead.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,33 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord:Floppa#0007", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "icon-flash" | ||
}, | ||
{ | ||
"name": "off-equipped-HELMET", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "off-inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "off-inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "on-equipped-HELMET", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+928 Bytes
...extures/ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi/off-equipped-HELMET.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
+409 Bytes
...es/Textures/ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi/off-inhand-left.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
+405 Bytes
...s/Textures/ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi/off-inhand-right.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
+960 Bytes
...Textures/ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi/on-equipped-HELMET.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
+656 Bytes
...urces/Textures/ADT/Clothing/Head/hoods/hoods_void_cloak.rsi/equipped-HELMET.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
+319 Bytes
Resources/Textures/ADT/Clothing/Head/hoods/hoods_void_cloak.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions
18
Resources/Textures/ADT/Clothing/Head/hoods/hoods_void_cloak.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,18 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord: filokini", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-HELMET", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+1.91 KB
...ADT/Clothing/OuterClothing/Hardsuits/inquisitory.rsi/equipped-OUTERCLOTHING.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
+751 Bytes
Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/inquisitory.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions
18
Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/inquisitory.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,18 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord:JayJacobs#1187", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-OUTERCLOTHING", | ||
"directions": 4 | ||
} | ||
] | ||
} |