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

Silly Slimes #144

Merged
merged 7 commits into from
Aug 27, 2024
Merged
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
8 changes: 4 additions & 4 deletions Resources/Prototypes/Floof/Entities/Mobs/NPCs/slimes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
color: "#FFFDFB"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
sprite: Floof/Mobs/Animals/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
Expand All @@ -26,7 +26,7 @@
color: "#45072f"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
sprite: Floof/Mobs/Animals/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
Expand All @@ -43,7 +43,7 @@
color: "#ae0072"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
sprite: Floof/Mobs/Animals/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
Expand All @@ -60,7 +60,7 @@
color: "#c90084"
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/elemental.rsi
sprite: Floof/Mobs/Animals/elemental.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: alive
Expand Down
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 Resources/Textures/Floof/Mobs/Animals/elemental.rsi/meta.json
Copy link
Collaborator

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 ...

Copy link
Contributor Author

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

Copy link
Contributor Author

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...

Copy link
Collaborator

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.

Copy link
Contributor Author

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?

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
]
]
}
]
}
2 changes: 1 addition & 1 deletion Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json
Copy link
Collaborator

Choose a reason for hiding this comment

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

This change is not related to the PR.
But il accept it.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "DakoDragon, discord ID: 56038550335922176",
"copyright": "Created by Fenndragon, discord ID: 190763499276861440",
"size": {
"x": 64,
"y": 64
Expand Down
Loading