Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

обмотки для ног #426

Merged
merged 2 commits into from
Feb 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1289,3 +1289,10 @@ Entries:
- {message: "Бойцы РХБЗЗ получили обновление снаряжения.", type: Tweak}
id: 55690 #костыль отображения в Обновлениях
time: '2024-02-20T20:20:00.0000000+00:00'

- author: Xelasto
changes:
- {message: "Добавлены коричневые обмотки для ног.", type: Add}
- {message: "Респрайт обмоток для ног. Автор спрайтов - floppo4ka_.", type: Tweak}
id: 55691 #костыль отображения в Обновлениях
time: '2024-02-24T20:20:00.0000000+00:00'
10 changes: 9 additions & 1 deletion Resources/Locale/ru-RU/ADT/Clothing/boots.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ ent-ADTClothingFootWrapsHighWhite = белые высокие обмотки д
.desc = Пара кусков ткани для тех, кому некомфортно в обычных человеческих ботинках.
.suffix = { "" }

ent-ADTClothingFootWrapsBrown = коричневые обмотки для ног
.desc = Пара кусков ткани для тех, кому некомфортно в обычных человеческих ботинках.
.suffix = { "" }

ent-ADTClothingFootWrapsHighBrown = коричневые высокие обмотки для ног
.desc = Пара кусков ткани для тех, кому некомфортно в обычных человеческих ботинках.
.suffix = { "" }

ent-ADTClothingAidanShoes = остроконечные туфли Эйдана
.desc = Стильные туфли из натуральной кожи крупного рогатого скота.
.suffix = { "Именное" }
Expand Down Expand Up @@ -84,4 +92,4 @@ ent-ADTClothingFootSportRoseShoes = ботинки STEP "Rose"
ent-ADTClothingFootSportStepSneakers = кроссовки STEP "Ultra"
.desc = Кроссовки серии STEP "Ultra" ставят легкость и сцепление превыше всего. Благодаря подошвам для бега с цепкой поверхностью и особой легкой метаморф-ткани, любые представители иных рас могут с полным комфортом на идти пробежку.
ent-ADTClothingFootSportZetaCrocs = кроссы STEP "Zeta"
.desc = Кроссы STEP "Zeta" имеют удобную подошву и ярко-зелёную переднюю часть, чтобы вас точно заметили среди травы.
.desc = Кроссы STEP "Zeta" имеют удобную подошву и ярко-зелёную переднюю часть, чтобы вас точно заметили среди травы.
24 changes: 24 additions & 0 deletions Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,30 @@
- type: Clothing
sprite: ADT/Clothing/Shoes/Boots/whitehigh_footwraps.rsi #спрайты от floppo4ka

- type: entity
parent: ClothingShoesBaseButcherable
id: ADTClothingFootWrapsBrown
name: brown footwraps
description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes.
components:
- type: Sprite
sprite: ADT/Clothing/Shoes/Boots/brown_footwraps.rsi #спрайты от floppo4ka
state: icon
- type: Clothing
sprite: ADT/Clothing/Shoes/Boots/brown_footwraps.rsi #спрайты от floppo4ka

- type: entity
parent: ClothingShoesBaseButcherable
id: ADTClothingFootWrapsHighBrown
name: brown white footwraps
description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes.
components:
- type: Sprite
sprite: ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi #спрайты от floppo4ka
state: icon
- type: Clothing
sprite: ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi #спрайты от floppo4ka

- type: entity
parent: ClothingShoesBaseButcherable
id: ADTClothingAidanShoes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,10 @@
ADTClothingSandals: 3
ADTClothingFootWrapsWhite: 3
ADTClothingFootWrapsBlack: 3
ADTClothingFootWrapsBrown: 3
ADTClothingFootWrapsHighWhite: 3
ADTClothingFootWrapsHighBlack: 3
ADTClothingFootWrapsHighBrown: 3
ADTClothingUniformTurtleneckBlack: 2
ADTClothingUniformTurtleneckBlackWomen: 2
ADTClothingUniformTurtleneckGrey: 2
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.
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,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:floppo4ka for Adventure Time MRP Server",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"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.
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,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:floppo4ka for Adventure Time MRP Server",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"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