Skip to content

Commit

Permalink
спонсоркие вещи Умы (AdventureTimeSS14#628)
Browse files Browse the repository at this point in the history
## Описание PR
Добавил спонсорские вещи Умы

## Почему / Баланс
Мне заплатили, ничего личного

:cl:
- add: Добавлены спонсорские вещи одного из жертвователей.

---------

Co-authored-by: PyotrIgn <[email protected]>
  • Loading branch information
PyotrIgn and PyotrIgn authored Oct 10, 2024
1 parent 2e9c472 commit eef1757
Show file tree
Hide file tree
Showing 35 changed files with 320 additions and 36 deletions.
15 changes: 15 additions & 0 deletions Resources/Locale/ru-RU/ADT/personalization.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -374,3 +374,18 @@ ent-ADTClothingUniformZoroJumpsuit = легендарный деловой ко
ent-ADTPlushieEmma = плюшевая Эмма
.desc = Кажется, она хочет заставить вас работать.
ent-ADTWeaponPistolUma = "Умми"
.desc = Пистолет на основе МК58, выполненный под прихоти владельца. На затворе имеет небольшую надпись "Умми".
.suffix = { "Пистолет, Спонсорское, Ума" }
ent-ADTClothingNeckUmaChoker = чокер Умы
.desc = Небольшого размера чокер, вокруг которого расположенны шипы, а спереди сердечко с надписью "Ума".
.suffix = { "Спонсорское, Ума" }
ent-ADTClothingOuterArmorUma = бронежилет
.desc = Небольшой, лёгкий бронежилет, предназвначенный для защиты груди. Поставляется в комплекте с налокотниками и наколенниками. В правом верхнем углу имеется небольшая табличка с именем владельца - "Ума Э.С."
.suffix = { "Спонсорское, Ума" }
ent-ADTClothingUniformJumpsuitUmaSport = тёмная спортивная форма
.desc = Облегающая спортивная форма, позволяющая телу дышать при интенсивных тренировках. Выглядит ухоженной и на удивление чистой. От неё исходит приятный запах.
.suffix = { "Спонсорское, Ума" }
Original file line number Diff line number Diff line change
Expand Up @@ -222,4 +222,28 @@ ent-ADTPosterUSSPKS = "Ищем тебя в Космических Силах"
ent-ADTPosterUSSPKDV = "Никто кроме нас!"
.desc = Плакат с бойцом Космо-Десантных войск СССП и их классическим девизом, ведущим свою историю уже почти шестой век.
.suffix = { "СССП" }
.suffix = { "СССП" }
ent-ADTPosterContrabandUmaHot = горячая Ума
.desc = На плакате изображена высокая вульпа, с рельефными мышцами, в откровенном наряде.
.suffix = { "Спонсорское, Ума" }
ent-ADTPosterContrabandUmaPress = горячая Ума
.desc = На плакате изображена высокая вульпа, демонстрирующая свой рельефный пресс.
.suffix = { "Спонсорское, Ума" }
ent-ADTPosterContrabandUmaSport = Спорт - Жизнь!
.desc = Плакат, призывающий занятся тебя спортом. Посмотри на неё, и на свой пивной живот!
.suffix = { "Спонсорское, Ума" }
ent-ADTPosterContrabandUmaAndAzalia = дружный коллектив
.desc = На плакате изображены два не безызвестных инженера, что очень "дружны"!
.suffix = { "Спонсорское, Ума" }
ent-ADTPosterContrabandUmaRabbit = Ума - кролик
.desc = На плакате изображенна высокая вульпа, в облегающем костюме кролика.
.suffix = { "Спонсорское, Ума" }
ent-ADTPosterContrabandUmaOnBeach = Пляжный сезон!
.desc = Плакат призывающий экипаж опробывать исскуственные пляжи на станции (пляж не доступен на некоторых станциях).
.suffix = { "Спонсорское, Ума" }
Original file line number Diff line number Diff line change
Expand Up @@ -586,3 +586,36 @@
- ADTSyrelBattleAxe
- type: Appearance

#cherreshnia (она же Ума)
- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformJumpsuitUmaSport
name: dark sporting clothing
description: dark sporting clothing
suffix: Sponsor, Uma
components:
- type: Sprite
sprite: ADT/Personalization/uma_sport_clothing.rsi
- type: Clothing
sprite: ADT/Personalization/uma_sport_clothing.rsi

- type: entity
parent: ClothingNeckBase
id: ADTClothingNeckUmaChoker
name: Uma`s choker
description: Uma`s choker
suffix: Sponsor, Uma
components:
- type: Sprite
sprite: ADT/Personalization/uma_choker.rsi

- type: entity
parent: ClothingOuterArmorBasic
id: ADTClothingOuterArmorUma
name: Uma`s armor vest
description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent.
components:
- type: Sprite
sprite: ADT/Personalization/uma_armor.rsi
- type: Clothing
sprite: ADT/Personalization/uma_armor.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -1097,3 +1097,20 @@
Wood: 250
- type: Prying

#cherreshnia (она же Ума)
- type: entity
name: Uma`s pistol
parent: WeaponPistolMk58
id: ADTWeaponPistolUma
description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo.
suffix: Sponsor, Uma
components:
- type: Sprite
sprite: ADT/Personalization/uma_pistol.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Clothing
sprite: ADT/Personalization/uma_pistol.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -795,3 +795,65 @@
- type: Sprite
sprite: ADT/Structures/Wallmounts/poster_syndicate.rsi
state: gasattack

#спонсорские контрабандные постеры с Умой

- type: entity
parent: ADTPosterBase
id: ADTPosterContrabandUmaHot
name: Uma`s poster 1
description: Uma`s poster 1
suffix: Sponsor, Uma
components:
- type: Sprite
state: poster_umahot_contraband #Спрайт от Празата

- type: entity
parent: ADTPosterBase
id: ADTPosterContrabandUmaPress
name: Uma`s poster 2
description: Uma`s poster 2
suffix: Sponsor, Uma
components:
- type: Sprite
state: poster_umapress_contraband #Спрайт от Празата

- type: entity
parent: ADTPosterBase
id: ADTPosterContrabandUmaSport
name: Uma`s poster 3
description: Uma`s poster 3
suffix: Sponsor, Uma
components:
- type: Sprite
state: poster_umasport_contraband #Спрайт от Празата

- type: entity
parent: ADTPosterBase
id: ADTPosterContrabandUmaAndAzalia
name: Uma`s poster 4
description: Uma`s poster 4
suffix: Sponsor, Uma
components:
- type: Sprite
state: poster_umaazalia_contraband #Спрайт от Празата

- type: entity
parent: ADTPosterBase
id: ADTPosterContrabandUmaRabbit
name: Uma`s poster 5
description: Uma`s poster 5
suffix: Sponsor, Uma
components:
- type: Sprite
state: poster_umarabbit_contraband #Спрайт от Празата

- type: entity
parent: ADTPosterBase
id: ADTPosterContrabandUmaOnBeach
name: Uma`s poster 6
description: Uma`s poster 6
suffix: Sponsor, Uma
components:
- type: Sprite
state: poster_umaonbeach_contraband #Спрайт от Празата
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@
- ADTPosterPanem
- ADTPosterGasAttack
- ADTPosterNoGood
- ADTPosterContrabandUmaHot
- ADTPosterContrabandUmaPress
- ADTPosterContrabandUmaSport
- ADTPosterContrabandUmaAndAzalia
- ADTPosterContrabandUmaRabbit
- ADTPosterContrabandUmaOnBeach
#ADT tweak ^^^
chance: 1

Expand Down
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.
26 changes: 26 additions & 0 deletions Resources/Textures/ADT/Personalization/uma_armor.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:prazat",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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.
18 changes: 18 additions & 0 deletions Resources/Textures/ADT/Personalization/uma_choker.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:prazat",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"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.
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.
39 changes: 39 additions & 0 deletions Resources/Textures/ADT/Personalization/uma_pistol.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:prazat",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "base"
},
{
"name": "bolt-open"
},
{
"name": "mag-0"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:prazat.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
88 changes: 53 additions & 35 deletions Resources/Textures/ADT/Structures/Wallmounts/posters.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,57 @@
"x": 32,
"y": 32
},
"states": [
{
"name": "poster_adtgreatfood_legit"
},
{
"name": "poster_adtturnonsensors_legit"
},
{
"name": "poster_adtoktoberfest_legit"
},
{
"name": "poster_adtoktoberfest2_legit"
},
{
"name": "poster_efficiencydiagram_legit"
},
{
"name": "poster_adtlusttayaran_contraband"
},
{
"name": "poster_adtfearthem_contraband"
},
{
"name": "poster_adtsilence_contraband"
},
{
"name": "poster_adtlustuma_contraband"
},
{
"name": "poster_adtlustardeco_contraband"
},
{
"name": "quadro_electronics"
}
]
"states": [
{
"name": "poster_adtgreatfood_legit"
},
{
"name": "poster_adtturnonsensors_legit"
},
{
"name": "poster_adtoktoberfest_legit"
},
{
"name": "poster_adtoktoberfest2_legit"
},
{
"name": "poster_efficiencydiagram_legit"
},
{
"name": "poster_adtlusttayaran_contraband"
},
{
"name": "poster_adtfearthem_contraband"
},
{
"name": "poster_adtsilence_contraband"
},
{
"name": "poster_adtlustuma_contraband"
},
{
"name": "poster_adtlustardeco_contraband"
},
{
"name": "quadro_electronics"
},
{
"name": "poster_umahot_contraband"
},
{
"name": "poster_umapress_contraband"
},
{
"name": "poster_umasport_contraband"
},
{
"name": "poster_umaazalia_contraband"
},
{
"name": "poster_umarabbit_contraband"
},
{
"name": "poster_umaonbeach_contraband"
}
]
}
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit eef1757

Please sign in to comment.