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.

Sign up for GitHub

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

Респрайт пиратского плаща #2460

Merged
merged 4 commits into from
Jan 8, 2025
Merged

Респрайт пиратского плаща #2460

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa458ec
who's afraid of the big black
Tris0r Jan 6, 2025
07b397d
Стален сказал - я сделал
Tris0r Jan 7, 2025
595d486
Я помню чудное мгновенье
Tris0r Jan 7, 2025
94040d4
Update meta.json
Tris0r Jan 8, 2025
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
description: A rather fetching black pirate cloak, complete with skull motif.
components:
- type: Sprite
sprite: Clothing/Neck/Cloaks/piratecap.rsi
sprite: SS220/Clothing/Neck/Cloaks/piratecloak220.rsi #ss220 resprite
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Что мешает оставить название RSI как piratecap? А то что оно в нашей папке - правильно, но 220 в названии как будто лишнее

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ничего.


- type: entity
parent: ClothingNeckBase
Expand Down
12 changes: 6 additions & 6 deletions Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ну-ну-ну. git checkout master -- Resources/Textures/Clothing/Neck/Cloaks/piratecap.rsi/meta.json

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Чо

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Откати

},
{
"name": "inhand-left",
Expand Down
Binary file added Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/equipped-NECK.png
View file
Open in desktop
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 Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/icon.png
View file
Open in desktop
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 Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-left.png
View file
Open in desktop
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 Resources/Textures/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/inhand-right.png
View file
Open in desktop
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/SS220/Clothing/Neck/Cloaks/piratecloak220.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "made by brainfood1183 (github) for ss14, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, resprite by okroshka59 (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading