-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> **Медиа** <!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если ваш PR представляет собой визуальное изменение, добавьте скриншоты, иначе он может быть закрыт. --> **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [ ] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [ ] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [ ] Я запускал локальный сервер со своими изменениями и всё протестировал. - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ian --> - add: Добавлены рога, кастомизация
- Loading branch information
Showing
15 changed files
with
201 additions
and
0 deletions.
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/sponsor.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,35 @@ | ||
marking-ADTAllsuccubus = Суккубус | ||
marking-ADTAllbasarab = Басараб | ||
marking-ADTAllcrayfish = Рачок | ||
marking-ADTAllhank = Хэнк | ||
marking-ADTAllhonor = Герой | ||
marking-ADTAllmadscientist = Безумный учёный | ||
marking-ADTAllmonday = Понедельник | ||
marking-ADTAllnemesida = Немезида | ||
marking-ADTAllpunk = Летов | ||
marking-ADTAllturanga = Туранга | ||
marking-ADTAlldurak = Дурак | ||
marking-ADTAllhorn1 = Дьявол | ||
marking-ADTAllhorn2 = Лукавый | ||
marking-ADTAllhorn3 = Чёрт | ||
marking-ADTAllhorn4 = Бес | ||
marking-ADTAllhorn5 = Шайтан | ||
marking-ADTAllhorn6 = Окаянный | ||
marking-ADTAlllord = Лорд | ||
marking-ADTAlloldpain = Лорд Боли | ||
marking-ADTAlltavrhorn = Минотавр | ||
marking-ADTAlltelehorn = Телерог | ||
marking-ADTAllvampirehorn = Рога Вампира | ||
marking-ADTSharkTail = Акулий хвост | ||
marking-ADTSharkFin = Акулий плавник | ||
marking-ADTAllAyanami = Аянами | ||
marking-ADTAllBubbleGum = Принцесса Буббль Гум | ||
marking-ADTAllCloud = Облако | ||
marking-ADTAllMavis = Мавис | ||
marking-ADTAllMorningHairstyle = Утренняя прическа 1 | ||
marking-ADTAllMorningHairstyle2 = Утренняя прическа 2 | ||
marking-ADTAllPonytail = Конский хвост | ||
marking-ADTAllPrinceCharming = Королевское очарование | ||
marking-ADTAllShavedFemale = Распущенные волосы (жен.) | ||
marking-ADTAllShavedFemaleUnisex = Распущенные волосы (унисекс) |
107 changes: 107 additions & 0 deletions
107
Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/sponsor.yml
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,107 @@ | ||
- type: marking | ||
id: ADTAlldurak | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: durak | ||
|
||
- type: marking | ||
id: ADTAllhorn1 | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: horn1 | ||
|
||
- type: marking | ||
id: ADTAllhorn2 | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: horn2 | ||
|
||
- type: marking | ||
id: ADTAllhorn3 | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: horn3 | ||
|
||
- type: marking | ||
id: ADTAllhorn4 | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: horn4 | ||
|
||
- type: marking | ||
id: ADTAllhorn5 | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: horn5 | ||
|
||
- type: marking | ||
id: ADTAllhorn6 | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: horn6 | ||
|
||
- type: marking | ||
id: ADTAlllord | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: lord | ||
|
||
- type: marking | ||
id: ADTAlloldpain | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: oldpain | ||
|
||
- type: marking | ||
id: ADTAlltavrhorn | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: tavrhorn | ||
|
||
- type: marking | ||
id: ADTAlltelehorn | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: telehorn | ||
|
||
- type: marking | ||
id: ADTAllvampirehorn | ||
bodyPart: HeadTop | ||
markingCategory: HeadTop | ||
sponsorOnly: true | ||
sprites: | ||
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi | ||
state: vampirehorn |
Binary file added
BIN
+440 Bytes
...rces/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/durak.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
+222 Bytes
...rces/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn1.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
+170 Bytes
...rces/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn2.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
+250 Bytes
...rces/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn3.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
+220 Bytes
...rces/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn4.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
+204 Bytes
...rces/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn5.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
+275 Bytes
...rces/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn6.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.13 KB
...urces/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/lord.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions
59
Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.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,59 @@ | ||
{ | ||
"version": 1, | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by discord:JayJacobs#1187", | ||
"states": [ | ||
{ | ||
"name": "durak", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "horn1", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "horn2", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "horn3", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "horn4", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "horn5", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "horn6", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "lord", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "oldpain", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "tavrhorn", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "telehorn", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "vampirehorn", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+386 Bytes
...es/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/oldpain.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
+410 Bytes
...s/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/tavrhorn.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
+307 Bytes
...s/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/telehorn.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
+443 Bytes
...extures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/vampirehorn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.