-
Notifications
You must be signed in to change notification settings - Fork 55
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
добавление именной гитары #311
Merged
Schrodinger71
merged 11 commits into
AdventureTimeSS14:master
from
walter-no-orochi:xyz=schrodyachmo
Jan 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
9915ed3
добавление именной гитары
walter-no-orochi ebe2742
фикс прошлой части пул реквеста
walter-no-orochi c8aefa5
дак
walter-no-orochi 67a7b2b
Update meta.json
Schrodinger71 a4dcc29
Запятая.
Schrodinger71 45d0616
Update Rock_guitar.ftl
Schrodinger71 db4b90a
Rename Rock_guitar.ftl to rock-guitar.ftl
Schrodinger71 0e1a222
Update darts.ftl
Schrodinger71 8cdc540
Delete Resources/Locale/ru-RU/ADT/Objects/Fan/rock-guitar.ftl
Schrodinger71 1739ea8
Update darts.ftl
Schrodinger71 26c1453
Create rock_gitar.ftl
Schrodinger71 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
12 changes: 12 additions & 0 deletions
12
Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.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,12 @@ | ||
- type: entity | ||
parent: SuperSynthesizerInstrument | ||
id: ADTEntityRockGuitarInstrument | ||
name: Chariton's multi-guitar | ||
description: The guitar of strict colors of one strict person. Black keys like a synthesizer are visible on the side of the guitar. | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Fun/Rock-guitar.rsi | ||
state: icon | ||
- type: Item | ||
size: Normal | ||
sprite: ADT/Objects/Fun/Rock-guitar.rsi | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rock_guitar.rsi на конце |
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.
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,18 @@ | ||
{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Изменить название папки на новое Rock_guitar.rsi |
||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "created by nerdyyyy__,", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"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.
Rock-guitar.rsi заменить на Rock_guitar.rsi и снизу также