-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Floofstation-V7
- Loading branch information
Showing
100 changed files
with
1,045 additions
and
841 deletions.
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
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
Binary file added
BIN
+1.91 KB
...res/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-resomi.png
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
66
Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.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 |
|---|---|---|
| @@ -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
BIN
+1.33 KB
...res/Clothing/OuterClothing/Suits/carpsuit.rsi/equipped-OUTERCLOTHING-resomi.png
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
50
Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.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 |
|---|---|---|
| @@ -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
BIN
+1.48 KB
...ures/Clothing/OuterClothing/Suits/chicken.rsi/equipped-OUTERCLOTHING-resomi.png
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
58
Resources/Textures/Clothing/OuterClothing/Suits/chicken.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 |
|---|---|---|
| @@ -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
BIN
+1.84 KB
...Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-resomi.png
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
74
Resources/Textures/Clothing/OuterClothing/Suits/eva.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 |
|---|---|---|
| @@ -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
BIN
+1.49 KB
...lothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-resomi.png
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
66
Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.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 |
|---|---|---|
| @@ -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
BIN
+1.55 KB
...Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-resomi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.