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

Resomi Fixes #392

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Resomi Fixes #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da3ae12
Resomi Fixes
FoxxoTrystan Dec 3, 2024
55de706
fix .rsi
FoxxoTrystan Dec 3, 2024
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
1 change: 1 addition & 0 deletions Resources/Prototypes/Floof/Entities/Mobs/Species/resomi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
layer:
- MobLayer
- type: DamageVisuals
thresholds: [ 10, 30, 50, 70 ]
damageOverlayGroups:
Brute:
sprite: Floof/Mobs/Effects/Resomi/brute_damage.rsi
Expand Down
Binary file added ...res/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-resomi.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.
66 changes: 35 additions & 31 deletions Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. Vox state made by Flareguy for Space Station 14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. Vox state made by Flareguy for Space Station 14, equipped-OUTERCLOTHING-resomi made by Pofitlo",
"size": {
"x": 32,
"y": 32
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-harpy",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-harpy",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-resomi",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Binary file added ...res/Clothing/OuterClothing/Suits/carpsuit.rsi/equipped-OUTERCLOTHING-resomi.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.
50 changes: 27 additions & 23 deletions Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github).",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by deltanedas (github), equipped-OUTERCLOTHING-resomi made by Pofitlo",
"size": {
"x": 32,
"y": 32
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-resomi",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Binary file added ...ures/Clothing/OuterClothing/Suits/chicken.rsi/equipped-OUTERCLOTHING-resomi.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.
58 changes: 31 additions & 27 deletions Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo",
"size": {
"x": 32,
"y": 32
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-resomi",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
}
]
}
Binary file added ...Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-resomi.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.
74 changes: 39 additions & 35 deletions Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by Pofitlo",
"size": {
"x": 32,
"y": 32
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-harpy",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-monkey",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-harpy",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-resomi",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Binary file added ...lothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-resomi.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.
66 changes: 35 additions & 31 deletions Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, harpy edit by VMSolidus, equipped-OUTERCLOTHING-resomi made by Pofitlo",
"size": {
"x": 32,
"y": 32
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-harpy",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-harpy",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-resomi",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Binary file added ...Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-resomi.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.
Loading
Loading