Skip to content

Commit

Permalink
костюм для Шреди (AdventureTimeSS14#681)
Browse files Browse the repository at this point in the history
## Описание PR
Добавление именного костюма для Шреди, который ему так хотелось

## Почему / Баланс
Потому что +rep 

:cl:
- add: Добавлена именная одежда для Шредингера
  • Loading branch information
PyotrIgn authored Oct 27, 2024
1 parent ae178cf commit 75dc097
Show file tree
Hide file tree
Showing 17 changed files with 161 additions and 8 deletions.
12 changes: 12 additions & 0 deletions Resources/Locale/ru-RU/ADT/personalization.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,14 @@ ent-ADTClothingUniformZoroJumpsuit = легендарный деловой ко
ent-ADTPlushieEmma = плюшевая Эмма
.desc = Кажется, она хочет заставить вас работать.
ent-ADTClothingHeadHatsSatanHoop = обруч с шипами
.desc = Маленький металлический обруч для головы, украшенный несколькими шипами. Острыми шипами.
.suffix = { "Именное, Schrodinger" }
ent-ADTClothingUniformSatanSuit = темный костюм с красной рубашкой
.desc = Прекрасно пошитый пиджак и брюки из темной ткани в сочетании с кроваво-красной рубашкой и чёрным галстуком.
.suffix = { "Именное, Schrodinger" }
ent-ADTWeaponPistolUma = "Умми"
.desc = Пистолет на основе МК58, выполненный под прихоти владельца. На затворе имеет небольшую надпись "Умми".
.suffix = { "Пистолет, Спонсорское, Ума" }
Expand All @@ -399,3 +407,7 @@ ent-ADTClothingOuterArmorUma = бронежилет
ent-ADTClothingUniformJumpsuitUmaSport = тёмная спортивная форма
.desc = Облегающая спортивная форма, позволяющая телу дышать при интенсивных тренировках. Выглядит ухоженной и на удивление чистой. От неё исходит приятный запах.
.suffix = { "Спонсорское, Ума" }
ent-ADTBartenderIDCardUrog = диск Урог-Джаха
.desc = Бывший диск ядерной авторизации, выигранный однажды Урог-Джахом у одного из капитанов Нанотрейзен (финансовый отдел все ещё выясняет, откуда у мистера Джаха деньги на подобную авантюру). Но теперь диск безопасен - ядерные коды с него удалены и вместо них записан доступ бармена.
.suffix = { "Именное, Урог-Джах" }
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,30 @@
Piercing: 0.7
Heat: 0.8

- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHatsSatanHoop
name: hoop with spikes
description: hoop with spikes
suffix: Именное, Schrodinger
components:
- type: Sprite
sprite: ADT/Personalization/hoop_spikes.rsi
- type: Clothing
sprite: ADT/Personalization/hoop_spikes.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformSatanSuit
name: black suit with red shirt
description: black suit with red shirt
suffix: Именное, Schrodinger
components:
- type: Sprite
sprite: ADT/Personalization/satan_suit.rsi
- type: Clothing
sprite: ADT/Personalization/satan_suit.rsi

# Pyotr
- type: entity
parent: ClothingOuterStorageBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1245,3 +1245,16 @@
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: ADT/Personalization/uma_pistol.rsi

#Vladya (Урог-Джах)
- type: entity
parent: IDCardStandard
id: ADTBartenderIDCardUrog
name: bartender ID card Urog
suffix: Именное, Урог-Джах
components:
- type: Sprite
sprite: ADT/Personalization/urog_card.rsi
state: icon
- type: PresetIdCard
job: Bartender
8 changes: 0 additions & 8 deletions Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@
<Box>
<GuideEntityEmbed Entity="HandTeleporter" Caption="Ручной Телепорт"/>
</Box>
- Украсть [color=#a4885c]Чрезвычайные приказы по безопасности[/color] Главы службы безопасности.
<Box>
<GuideEntityEmbed Entity="BookSecretDocuments" Caption="Чрезвычайные приказы по безопасности"/>
</Box>
- Украсть [color=#a4885c]ID карту главы персонала[/color].
<Box>
<GuideEntityEmbed Entity="HoPIDCard" Caption="ID карта главы персонала"/>
Expand All @@ -90,9 +86,5 @@
<Box>
<GuideEntityEmbed Entity="BoxFolderQmClipboard" Caption="Портативный планшет заказов"/>
</Box>
- Украсть [color=#a4885c]Гравитационное ядро[/color], подорвав Генератор Гравитации.
<Box>
<GuideEntityEmbed Entity="NesGravityGeneratorCore" Caption="Гравитационное ядро"/>
</Box>

</Document>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 Resources/Textures/ADT/Personalization/hoop_spikes.rsi/meta.json
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:not_so_big_chungus",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions Resources/Textures/ADT/Personalization/satan_suit.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:not_so_big_chungus",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 64 additions & 0 deletions Resources/Textures/ADT/Personalization/urog_card.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:not_so_big_chungus",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
]
]
}
]
}

0 comments on commit 75dc097

Please sign in to comment.