Skip to content

Commit

Permalink
Merge pull request #187 from FaDeOkno/katana-zero-clothing
Browse files Browse the repository at this point in the history
Вещи Зеро (вродь)
  • Loading branch information
Schrodinger71 authored Dec 5, 2023
2 parents 239c4e4 + 9dc9b2f commit 17174db
Show file tree
Hide file tree
Showing 27 changed files with 180 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,6 @@ ent-ADTClothingHeadHatDedMoroz = Колпак Деда Мороза
ent-ADTClothingHeadHatRoga = Праздничные рога
.desc = .
.suffix = { "Новый Год" }
ent-ADTClothingHeadHatsBeretArmy = армейский берет
.desc = Потрёпанный на службе военный берет. Имеет золотую нашивку сбоку.
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Mask/mask.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ ent-ADTClothingMaskGasLapkeeSet = белый противогаз СБ
ent-ADTClothingMaskBorodaDedMoroz = Борода и усы Дед Мороза
.desc = Борода Деда Мороза с усами люкс качества, позволит создать вам полный образ Деда Мороза или Санта Клауса. Дети не узнают папу, соседа, или актера.
.suffix = { "Новый Год" }
ent-ADTChronosMask = визор "Жертва Хроноса"
.desc = Продвинутый визор, сделанный на заказ неким учёным. На боковой стороне визора видна роспись: Х.К.
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Neck/cloak.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ ent-ADTClothingNeckNukeOpsCloak = плащ Ядерных Оперативник
ent-ADTClothingNeckMantiesChaplain = Мантия священника
.desc = Черная мантия священника.
.suffix = { "" }
ent-ADTClothingNeckNewMekkaCloak = накидка Новой Мекки
.desc = Зеленая накидка, очень удобная в носке. Скреплена застёжкой на шее.
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -270,3 +270,6 @@ ent-ADTClothingUniformJumpsuitOldDarkSuit = старый темный комби
ent-ADTClothingUniformJumpsuitLapkeeSet = тёмная охранная водолазка
.desc = Возможно сделанная на заказ прочная, с явно имеющими место быть броневставками водолазка для тяжёлой работы в тяжёлых условиях дальнего космоса. От неё приятно веет мандаринками и военными преступлениями.
.suffix = { "Именное, Lapkee" }
ent-ADTClothingUniformNewMekka = униформа Новой Мекки
.desc = Эта униформа имеет очень долгую и кровавую историю...
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Clothing/boots.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,6 @@ ent-ADTClothingFootBlackBoots = чёрные сапоги
ent-ADTClothingFootLapkeeSet = тактические кроссовки
.desc = Тяжёлая и увесистая обувь, которой и убить не трудно - доработанная чьими то хитрыми лапками пара кроссовок с выпрямленными носками, уплотненной подошвой и повышенной эргономикой. Прекрасно давит клоунов.
.suffix = { "Именное, Lapkee" }
ent-ADTClothingFootNewMekkaBoots = сапоги Новой Мекки
.desc = Явно потрёпанные сапоги, в которых прошли уж точно не одну милю.
11 changes: 11 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -395,3 +395,14 @@
sprite: ADT/Clothing/Head/Hats/beret_CentCom.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/beret_CentCom.rsi

- type: entity
parent: ClothingHeadBase
id: ADTClothingHeadHatsBeretArmy
name: army beret
description: army beret
components:
- type: Sprite
sprite: ADT/Clothing/Head/Hats/armyberet.rsi
- type: Clothing
sprite: ADT/Clothing/Head/Hats/armyberet.rsi
16 changes: 16 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,19 @@
mask:
- state: equipped-MASK
- type: BreathMask

- type: entity
parent: ClothingMaskBase
id: ADTChronosMask
name: chronos victim mask
description: chronos victim mask
components:
- type: Sprite
sprite: ADT/Clothing/Mask/chronosvisor.rsi
- type: Clothing
sprite: ADT/Clothing/Mask/chronosvisor.rsi
- type: BreathMask
- type: ShowSecurityIcons
- type: FlashImmunity
- type: EyeProtection
protectionTime: 5
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,13 @@
components:
- type: Sprite
sprite: ADT/Clothing/Neck/Cloaks/nukeops_cloak.rsi #спрайты от floppo4ka


- type: entity
parent: ClothingNeckBase
id: ADTClothingNeckNewMekkaCloak
name: New Mekka cloak
description: Protect from cold evening on a nukie planet.
components:
- type: Sprite
sprite: ADT/Clothing/Neck/Cloaks/newmekkacloak.rsi #спрайты от floppo4ka
13 changes: 13 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,3 +307,16 @@
- Sidearm
- type: TemperatureProtection #слабая защита от холода
coefficient: 0.05


- type: entity
parent: ClothingShoesBaseButcherable
id: ADTClothingFootNewMekkaBoots
name: New Mekka boots
description: Comfortable for bullies!
components:
- type: Sprite
sprite: ADT/Clothing/Shoes/Boots/newmekka.rsi
- type: Clothing
sprite: ADT/Clothing/Shoes/Boots/newmekka.rsi #спрайты от prazat911

17 changes: 17 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,23 @@
- type: Clothing
sprite: ADT/Clothing/Uniforms/Turleneck/turleneck_whiteblacksleeveless.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformNewMekka
name: New Mekka jumpsuit
description: New Mekka jumpsuit
components:
- type: Sprite
sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi
- type: Clothing
sprite: ADT/Clothing/Uniforms/Jumpsuit/newmekkauniform.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.8
Piercing: 0.8
Heat: 0.9

#далее идут водолазки, которые Празат попросил вырезать на время их доделывания. Потом их переделать и закинуть по йамлам.
#- type: entity
# parent: ClothingUniformBase
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.
18 changes: 18 additions & 0 deletions Resources/Textures/ADT/Clothing/Head/Hats/armyberet.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": "Adventure Time MRP, discord: prazat911",
"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.
18 changes: 18 additions & 0 deletions Resources/Textures/ADT/Clothing/Mask/chronosvisor.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:prazat911",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-MASK",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Adventure Time MRP, discord: prazat911",
"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.
18 changes: 18 additions & 0 deletions Resources/Textures/ADT/Clothing/Shoes/Boots/newmekka.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": "Adventure Time MRP, discord: prazat911",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "icon"
}
]
}
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": "Adventure Time MRP, discord: prazat911",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
}
]
}

0 comments on commit 17174db

Please sign in to comment.