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

RandomResprites 01 #2473

Closed
wants to merge 7 commits into from
Closed
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
2 changes: 1 addition & 1 deletion Resources/Textures/Mobs/Pets/cat.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, syndicat created by Aleksh (discord)",
"copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, syndicat created by Aleksh (discord), syndicat resprite by .kreks. (discord)",
"states": [
{
"name": "cak",
Expand Down
Binary file modified Resources/Textures/Mobs/Pets/cat.rsi/syndicat.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 modified Resources/Textures/Mobs/Pets/cat.rsi/syndicat_dead.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 38 additions & 38 deletions Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0, Baystation 12 and AuroraStation",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "rollerbed"
},
{
"name": "rollerbed_buckled"
},
{
"name": "rollerbed_folded"
},
{
"name": "cheap_rollerbed"
},
{
"name": "cheap_rollerbed_buckled"
},
{
"name": "cheap_rollerbed_folded"
},
{
"name": "emergency_rollerbed"
},
{
"name": "emergency_rollerbed_buckled"
},
{
"name": "emergency_rollerbed_folded"
}
]
}
{

Check failure on line 1 in Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json

View workflow job for this annotation

GitHub Actions / CRLF Check

File contains CRLF line endings

The file 'Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json' was committed with CRLF new lines. Please make sure your git client is configured correctly and you are not uploading files directly to GitHub via the web interface.
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0, Baystation 12 and AuroraStation",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "rollerbed"
},
{
"name": "rollerbed_buckled"
},
{
"name": "rollerbed_folded"
},
{
"name": "cheap_rollerbed"
},
{
"name": "cheap_rollerbed_buckled"
},
{
"name": "cheap_rollerbed_folded"
},
{
"name": "emergency_rollerbed"
},
{
"name": "emergency_rollerbed_buckled"
},
{
"name": "emergency_rollerbed_folded"
}
]
}
Loading