Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Corvax Resprites #86

Merged
merged 2 commits into from
Apr 28, 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
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
- type: Sprite
sprite: Nyanotrasen/Structures/Wallmounts/conspiracy_board.rsi
state: icon
offset: "0.5,0"

- type: entity
parent: BaseSign
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,41 +1,49 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Drawn by Ubaser, resprited by fazan_saverg (842350861123452948) on discord.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-FEET",
"directions": 4
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Drawn by Ubaser, resprited by fazan_saverg (842350861123452948) on discord. Sprite reptilian created by ugog",
"size": {
"x": 32,
"y": 32
},
{
"name": "on-equipped-FEET",
"directions": 4
},
{
"name": "icon"
},
{
"name": "icon-on"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
]
"states": [
{
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "on-equipped-FEET",
"directions": 4
},
{
"name": "on-equipped-FEET-reptilian",
"directions": 4
},
{
"name": "icon"
},
{
"name": "icon-on"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
]
}
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.
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/Structures/Doors/secret_door.rsi/assembly.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/Structures/Doors/secret_door.rsi/closed.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/Structures/Doors/secret_door.rsi/closing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 13 additions & 13 deletions Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Nimfar11 (GitHub) for Space Station 14",
"copyright": "Made by Nimfar11 (GitHub) for Space Station 14 & edited by github:Morb0",
"size": {
"x": 32,
"y": 32
Expand All @@ -24,12 +24,12 @@
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
},
Expand All @@ -47,12 +47,12 @@
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
}
Expand Down
Binary file modified Resources/Textures/Structures/Doors/secret_door.rsi/open.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/Structures/Doors/secret_door.rsi/opening.png
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy. Sprite reptilian created by ugog",
"size": {
"x": 32,
"y": 32
Expand All @@ -11,10 +11,18 @@
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "on-equipped-FEET",
"directions": 4
},
{
"name": "on-equipped-FEET-reptilian",
"directions": 4
},
{
"name": "icon"
},
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by Dvir001 (GitHub)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by Dvir001 (GitHub). Sprite reptilian created by ugog",
"size": {
"x": 32,
"y": 32
Expand All @@ -11,10 +11,18 @@
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "on-equipped-FEET",
"directions": 4
},
{
"name": "on-equipped-FEET-reptilian",
"directions": 4
},
{
"name": "icon"
},
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy | Resprited for mercenary by erhardsteinhauer (discord)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy | Resprited for mercenary by erhardsteinhauer (discord). Sprite reptilian created by ugog",
"size": {
"x": 32,
"y": 32
Expand All @@ -11,10 +11,18 @@
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "on-equipped-FEET",
"directions": 4
},
{
"name": "on-equipped-FEET-reptilian",
"directions": 4
},
{
"name": "icon"
},
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-4.0",
"copyright": "Content created by GhostPrince for Frontier Server",
"copyright": "Content created by GhostPrince for Frontier Server. Sprite reptilian created by ugog",
"size": {
"x": 32,
"y": 32
Expand All @@ -11,10 +11,18 @@
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "on-equipped-FEET",
"directions": 4
},
{
"name": "on-equipped-FEET-reptilian",
"directions": 4
},
{
"name": "icon"
},
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe Based and edited by SungYandy. Sprite reptilian created by ugog",
"size": {
"x": 32,
"y": 32
Expand All @@ -11,10 +11,18 @@
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "on-equipped-FEET",
"directions": 4
},
{
"name": "on-equipped-FEET-reptilian",
"directions": 4
},
{
"name": "icon"
},
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.
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.
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.
Binary file modified Resources/Textures/_NF/Structures/Holo/nfsd.rsi/icon.png
Loading