-
Notifications
You must be signed in to change notification settings - Fork 54
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
Добавление набора одежды "Возмездия" #547
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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,23 @@ | ||
ent-ADTClothingNeckKivchikCloak = плащ возмездия | ||
.desc = Аккуратный чёрный плащ с золотистыми полосками и застёжками. | ||
.suffix = { "Именное, Kivchik" } | ||
|
||
ent-ADTClothingUniformKivchikJumpskirt = юбка-комбинезон возмездия | ||
.desc = Выглаженный чёрный комбинезон с золотистыми полосками и красной повязкой на плече. | ||
.suffix = { "Именное, Kivchik" } | ||
|
||
ent-ADTClothingHeadHatKivchikBerete = берет возмездия | ||
.desc = Красивый чёрный берет. Он пахнет ягодами. | ||
.suffix = { "Именное, Kivchik" } | ||
|
||
ent-ADTClothingHandsKivchikGloves = перчатки возмездия | ||
.desc = Чёрные перачтки с золотистой полоской и красной надписью "ALMD" | ||
.suffix = { "Именное, Kivchik" } | ||
|
||
ent-ADTClothingShoesKivchikBoots = ботинки возмездия | ||
.desc = Большие чёрные ботинки с металлическими вставками. Выглядят надёжно. | ||
.suffix = { "Именное, Kivchik" } | ||
|
||
ent-ADTClothingBackpackKivchikSatchel = сумка возмездия | ||
.desc = Красивая чёрная сумка с золотими застёжками и красными линиями. | ||
.suffix = { "Именное, Kivchik" } |
76 changes: 76 additions & 0 deletions
76
Resources/Prototypes/ADT/Entities/Clothing/KivchikSet/kivchikset.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,76 @@ | ||
- type: entity | ||
parent: ClothingNeckBase | ||
id: ADTClothingNeckKivchikCloak | ||
suffix: Kivchik | ||
name: black cloak of retribution | ||
description: A neat black raincoat with golden stripes and clasps. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Neck/Cloaks/kivchikset_cloak.rsi | ||
- type: StealTarget | ||
stealGroup: HeadCloak | ||
|
||
- type: entity | ||
parent: ClothingUniformSkirtBase | ||
id: ADTClothingUniformKivchikJumpskirt | ||
suffix: Kivchik | ||
name: black jumpsuit of retribution | ||
description: Black jumpsuit with golden stripes and red bandage. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi | ||
|
||
- type: entity | ||
parent: ClothingHeadBase | ||
id: ADTClothingHeadHatKivchikBerete | ||
suffix: Kivchik | ||
name: blue beret of retribution | ||
description: A beautiful black beret. He smells like berries. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Head/Hats/kivchikset_beret.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Head/Hats/kivchikset_beret.rsi | ||
- type: Tag | ||
tags: | ||
- ClothMade | ||
- HamsterWearable | ||
|
||
- type: entity | ||
parent: ClothingHandsBase | ||
id: ADTClothingHandsKivchikGloves | ||
suffix: Kivchik | ||
name: black gloves of retribution | ||
description: 'Beautiful black gloves with a gold stripe and red inscription: "ALMD"' | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi | ||
- type: Fiber | ||
fiberColor: fibers-black | ||
|
||
- type: entity | ||
parent: ClothingShoesMilitaryBase | ||
id: ADTClothingShoesKivchikBoots | ||
suffix: Kivchik | ||
name: boots of retribution | ||
description: Black boots with metal inserts. Look reliable. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi | ||
- type: Clothing | ||
sprite: ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi | ||
- type: Matchbox | ||
|
||
- type: entity | ||
parent: ClothingBackpackSatchel | ||
id: ADTClothingBackpackKivchikSatchel | ||
suffix: Kivchik | ||
name: satchel of retribution | ||
description: A beautiful black bag with a gold clasp and red stripes. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Clothing/Back/kivchikset_satchel.rsi |
Binary file added
BIN
+663 Bytes
Resources/Textures/ADT/Clothing/Back/kivchikset_satchel.rsi/equipped-BACKPACK.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
+783 Bytes
Resources/Textures/ADT/Clothing/Back/kivchikset_satchel.rsi/icon.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
+727 Bytes
Resources/Textures/ADT/Clothing/Back/kivchikset_satchel.rsi/inhand-left.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
+667 Bytes
Resources/Textures/ADT/Clothing/Back/kivchikset_satchel.rsi/inhand-right.png
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
26
Resources/Textures/ADT/Clothing/Back/kivchikset_satchel.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,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Sprites made by Kivchik (Adventure Time Team)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "equipped-BACKPACK", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+350 Bytes
...rces/Textures/ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi/equipped-HAND.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
+676 Bytes
Resources/Textures/ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi/icon.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
+505 Bytes
Resources/Textures/ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi/inhand-left.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
+520 Bytes
...urces/Textures/ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi/inhand-right.png
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
26
Resources/Textures/ADT/Clothing/Hands/Gloves/kivchikset_gloves.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,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Resprite by Kivchik (Adventure Time Team) | Original: taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/b9c06b16579dc828ac4d6f603995e083075725b2", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "equipped-HAND", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+424 Bytes
...extures/ADT/Clothing/Head/Hats/kivchikset_beret.rsi/equipped-HELMET-hamster.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
+420 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/kivchikset_beret.rsi/equipped-HELMET.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
+295 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/kivchikset_beret.rsi/icon.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
+347 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/kivchikset_beret.rsi/inhand-left.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
+321 Bytes
Resources/Textures/ADT/Clothing/Head/Hats/kivchikset_beret.rsi/inhand-right.png
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
30
Resources/Textures/ADT/Clothing/Head/Hats/kivchikset_beret.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,30 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Resprite by Kivchik (Adventure Time Team) | Original: taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-HELMET", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-HELMET-hamster", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+2.07 KB
Resources/Textures/ADT/Clothing/Neck/Cloaks/kivchikset_cloak.rsi/equipped-NECK.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
+844 Bytes
Resources/Textures/ADT/Clothing/Neck/Cloaks/kivchikset_cloak.rsi/icon.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
+704 Bytes
Resources/Textures/ADT/Clothing/Neck/Cloaks/kivchikset_cloak.rsi/inhand-left.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
+679 Bytes
Resources/Textures/ADT/Clothing/Neck/Cloaks/kivchikset_cloak.rsi/inhand-right.png
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
26
Resources/Textures/ADT/Clothing/Neck/Cloaks/kivchikset_cloak.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,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Resprite by Kivchik (Adventure Time Team) | Original: taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "equipped-NECK", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+736 Bytes
Resources/Textures/ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi/equipped-FEET.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
+455 Bytes
Resources/Textures/ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi/icon.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
+421 Bytes
Resources/Textures/ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi/inhand-left.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
+429 Bytes
Resources/Textures/ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi/inhand-right.png
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
26
Resources/Textures/ADT/Clothing/Shoes/Boots/kivchikset_boots.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,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Resprite by Kivchik (Adventure Time Team) | Original: by Username228 (#serj3428 discord)", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "equipped-FEET", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+870 Bytes
...thing/Uniforms/Jumpskirt/kivchikset_skirt.rsi/equipped-INNERCLOTHING-monkey.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.3 KB
...ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi/equipped-INNERCLOTHING.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
+606 Bytes
Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi/icon.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
+433 Bytes
...s/Textures/ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi/inhand-left.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
+580 Bytes
.../Textures/ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi/inhand-right.png
Oops, something went wrong.
30 changes: 30 additions & 0 deletions
30
Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.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,30 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Resprite by Kivchik (Adventure Time Team) | Original: taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-INNERCLOTHING", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "equipped-INNERCLOTHING-monkey", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Юзернейм на респрайт добро дал