-
Notifications
You must be signed in to change notification settings - Fork 64
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
Silly Slimes #144
Merged
Merged
Silly Slimes #144
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d771d6d
Create placeholder
fenndragon 303edce
special slime sprites
fenndragon 92003cd
Delete Resources/Textures/Floof/Mobs/Animals/elemental.rsi/placeholder
fenndragon cee9659
Update slimes.yml
fenndragon f67515a
Merge branch 'Fansana:master' into SillySlimes
fenndragon e875d35
Update meta.json
fenndragon 5f26f6c
Update meta.json
fenndragon 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
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.
44 changes: 44 additions & 0 deletions
44
Resources/Textures/Floof/Mobs/Animals/elemental.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,44 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC0-1.0", | ||
"copyright": "Created by TheShuEd (github) for Space Station 14. Edited by Fenndragon", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "dead" | ||
}, | ||
{ | ||
"name": "alive", | ||
"directions": 4, | ||
"delays": [ | ||
[ | ||
0.2, | ||
0.2, | ||
0.2, | ||
0.2 | ||
], | ||
[ | ||
0.2, | ||
0.2, | ||
0.2, | ||
0.2 | ||
], | ||
[ | ||
0.2, | ||
0.2, | ||
0.2, | ||
0.2 | ||
], | ||
[ | ||
0.2, | ||
0.2, | ||
0.2, | ||
0.2 | ||
] | ||
] | ||
} | ||
] | ||
} |
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. This change is not related to the PR. |
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
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.
You need to reffer to anyone that did a change.
Orignal creator of the sprite + edited by ...
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.
blinks no, I specified that I changed 4 slimes sprites, there are only 2 sprites.
there are 4 slimes that get those 2 sprites. it's pretty clear I didn't say I was changing all slimes
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.
also OH! we're doing credits on this stuff now? I... don't actually think I've put credits on any of the work I've done so far...
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.
You have to mention that you edited the sprites.
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.
where do I do this?