Skip to content

Commit

Permalink
Revert "Temporarily Revert "Windows And Tables Resprites! (#958)""
Browse files Browse the repository at this point in the history
This reverts commit 5679754.
  • Loading branch information
zelezniciar1 committed Oct 13, 2024
1 parent e596053 commit 8dce104
Show file tree
Hide file tree
Showing 94 changed files with 230 additions and 991 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@
- type: Construction
graph: Table
node: TableBrass

- type: entity
id: TableWood
parent: TableBase
Expand Down Expand Up @@ -604,7 +604,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 25
damage: 25
behaviors:
- !type:PlaySoundBehavior
sound:
Expand Down Expand Up @@ -677,7 +677,7 @@
- type: Construction
graph: Table
node: TableFancyRed

- type: entity
id: TableFancyPurple
parent: TableFancyBase
Expand All @@ -690,7 +690,7 @@
- type: Construction
graph: Table
node: TableFancyPurple

- type: entity
id: TableFancyPink
parent: TableFancyBase
Expand All @@ -703,7 +703,7 @@
- type: Construction
graph: Table
node: TableFancyPink

- type: entity
id: TableFancyGreen
parent: TableFancyBase
Expand All @@ -712,11 +712,11 @@
- type: Sprite
sprite: Structures/Furniture/Tables/Fancy/green.rsi
- type: Icon
sprite: Structures/Furniture/Tables/Fancy/green.rsi
sprite: Structures/Furniture/Tables/Fancy/green.rsi
- type: Construction
graph: Table
node: TableFancyGreen

- type: entity
id: TableFancyOrange
parent: TableFancyBase
Expand All @@ -729,7 +729,7 @@
- type: Construction
graph: Table
node: TableFancyOrange

- type: entity
id: TableFancyWhite
parent: TableFancyBase
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.
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 https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi",
"copyright":"Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bd91a1b962fe9bd38e346e9fafd4ebb10784fcb3/icons/obj/doors/windoor.dmi",
"size": {
"x":32,
"y":32
Expand Down
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/Furniture/Tables/carpet.rsi/full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
137 changes: 10 additions & 127 deletions Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,159 +5,42 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47f6d91b37609b940152de62befa931dba35adf0",
"states": [
{
"name": "full",
"delays": [
[
1
]
]
"name": "full"
},
{
"name": "state_0",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "state_1",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "state_2",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "state_3",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "state_4",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "state_5",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "state_6",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "state_7",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"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.
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/Structures/Furniture/Tables/frame.rsi/full.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.
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.
Loading

0 comments on commit 8dce104

Please sign in to comment.