diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index 4c8427e46ee..2a546bc5cf2 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -443,7 +443,7 @@ - type: Construction graph: Table node: TableBrass - + - type: entity id: TableWood parent: TableBase @@ -604,7 +604,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 25 + damage: 25 behaviors: - !type:PlaySoundBehavior sound: @@ -677,7 +677,7 @@ - type: Construction graph: Table node: TableFancyRed - + - type: entity id: TableFancyPurple parent: TableFancyBase @@ -690,7 +690,7 @@ - type: Construction graph: Table node: TableFancyPurple - + - type: entity id: TableFancyPink parent: TableFancyBase @@ -703,7 +703,7 @@ - type: Construction graph: Table node: TableFancyPink - + - type: entity id: TableFancyGreen parent: TableFancyBase @@ -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 @@ -729,7 +729,7 @@ - type: Construction graph: Table node: TableFancyOrange - + - type: entity id: TableFancyWhite parent: TableFancyBase diff --git a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/assembly.png b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/assembly.png index 668997d837e..1c397d15c74 100644 Binary files a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/closed.png b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/closed.png index fe1f75ba132..528b2cada2f 100644 Binary files a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/closed.png and b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/closing.png b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/closing.png index e7085665d79..44c87b9aca4 100644 Binary files a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/closing.png and b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json index 66954b66626..ecc17f8affb 100644 --- a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/opening.png b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/opening.png index 5b68943ff61..08b296af385 100644 Binary files a/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/opening.png and b/Resources/Textures/Structures/Doors/Windoors/windoor.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/full.png index 1b774e05759..c5587a9fa1c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json index 0ebc40b8144..1ad8b4f3583 100644 --- a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/meta.json @@ -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 } ] } diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png index f57395c659c..197d42df822 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png index f3631cfc0ea..43aca220cfa 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png index f57395c659c..197d42df822 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png index f3631cfc0ea..43aca220cfa 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png index a8d469a32f9..5ab0bb93dfd 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png index 6cbcfa1beff..f429ddeb5ac 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png index a8d469a32f9..5ab0bb93dfd 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png index 29bd4db74b9..0209287820a 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png index 2af9b7ff1b8..4eed0b0b085 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png index 2ba1f779a28..b0eb81d2c93 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png index 27684dc2589..2a982fa394b 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png index 2ba1f779a28..b0eb81d2c93 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png index 27684dc2589..2a982fa394b 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png index f2df00c177c..cc0ad2cf1cf 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png index 682b8d26e10..47e94567e70 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png index f2df00c177c..cc0ad2cf1cf 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/frame.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png index 41b2c199d18..4f41d6f7dee 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/meta.json index 0ebc40b8144..3d992bc28d3 100644 --- a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/meta.json @@ -1,163 +1,46 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", - "states": [ - { - "name": "full", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "state_0", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_1", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_2", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_3", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_4", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_5", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_6", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_7", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] -} + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bd91a1b962fe9bd38e346e9fafd4ebb10784fcb3/icons/obj/smooth_structures/tables/table.dmi", + "states": [ + { + "name": "full" + }, + { + "name": "state_0", + "directions": 4 + }, + { + "name": "state_1", + "directions": 4 + }, + { + "name": "state_2", + "directions": 4 + }, + { + "name": "state_3", + "directions": 4 + }, + { + "name": "state_4", + "directions": 4 + }, + { + "name": "state_5", + "directions": 4 + }, + { + "name": "state_6", + "directions": 4 + }, + { + "name": "state_7", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png index 47ab5fc187e..7f0bb2b5b29 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png index 3e78a2531b9..fa15c2495e3 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png index 47ab5fc187e..7f0bb2b5b29 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png index 3e78a2531b9..fa15c2495e3 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png index f4f9168b071..e5d4b519fef 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png index 0046d100290..eaec7e603a2 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png index f4f9168b071..e5d4b519fef 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png index 165f578dc0b..8cac72fc6f5 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png index 4c394c4650e..cbcbd3a3b13 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/meta.json index 0ebc40b8144..1ad8b4f3583 100644 --- a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/meta.json @@ -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 } ] } diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png index 2ed3dbb4c09..d8d134f0cf2 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png index f63429f102c..4d979a5381a 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png index 2ed3dbb4c09..d8d134f0cf2 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png index f63429f102c..4d979a5381a 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png index 71d87be2d18..7ba52d1dd5c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png index 74794bbf345..16c34ffa59c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png index 71d87be2d18..7ba52d1dd5c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png index ecdf387b8fa..c2e924aaafc 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png index 7345eb65919..7f999c52334 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/meta.json index 0ebc40b8144..1ad8b4f3583 100644 --- a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/meta.json @@ -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 } ] } diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png index a8791e01c1e..5ff4a7ceac3 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png index 4e04182a05d..dab25bc1cda 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png index a8791e01c1e..5ff4a7ceac3 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png index 4e04182a05d..dab25bc1cda 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png index 230838bfc60..34d673b2ea4 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png index 2da0cebb25a..428050b93c6 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png index 230838bfc60..34d673b2ea4 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png index 82880b87ad6..aab0092a56e 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png index be30ee84c50..0fae301078b 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/meta.json index 0ebc40b8144..966ed1ee959 100644 --- a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/meta.json @@ -1,163 +1,46 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", - "states": [ - { - "name": "full", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "state_0", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_1", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_2", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_3", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_4", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_5", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_6", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_7", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] -} + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bd91a1b962fe9bd38e346e9fafd4ebb10784fcb3/icons/obj/smooth_structures/tables/rglass_table.dmi", + "states": [ + { + "name": "full" + }, + { + "name": "state_0", + "directions": 4 + }, + { + "name": "state_1", + "directions": 4 + }, + { + "name": "state_2", + "directions": 4 + }, + { + "name": "state_3", + "directions": 4 + }, + { + "name": "state_4", + "directions": 4 + }, + { + "name": "state_5", + "directions": 4 + }, + { + "name": "state_6", + "directions": 4 + }, + { + "name": "state_7", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png index 862aff93380..bc2443592a3 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png index 8b97929d643..46a287ee483 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png index 862aff93380..bc2443592a3 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png index 8b97929d643..46a287ee483 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png index 57fdbb30d75..e4fd4d16ddb 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png index b3231dc9724..d04eac89c9a 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png index 57fdbb30d75..e4fd4d16ddb 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png index 495a1103fbf..8e15bd7f119 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/r_glass.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png index 19dec0a9840..478eca14b0f 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/meta.json index 0ebc40b8144..3f2fb05658d 100644 --- a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/meta.json @@ -1,163 +1,46 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", - "states": [ - { - "name": "full", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "state_0", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_1", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_2", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_3", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_4", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_5", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_6", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_7", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] -} + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bd91a1b962fe9bd38e346e9fafd4ebb10784fcb3/icons/obj/smooth_structures/tables/reinforced_table.dmi", + "states": [ + { + "name": "full" + }, + { + "name": "state_0", + "directions": 4 + }, + { + "name": "state_1", + "directions": 4 + }, + { + "name": "state_2", + "directions": 4 + }, + { + "name": "state_3", + "directions": 4 + }, + { + "name": "state_4", + "directions": 4 + }, + { + "name": "state_5", + "directions": 4 + }, + { + "name": "state_6", + "directions": 4 + }, + { + "name": "state_7", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png index 1e061724e1b..b42b1c05bb7 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png index 428ae7c3e1f..6d74f31f6ea 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png index 1e061724e1b..b42b1c05bb7 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png index 428ae7c3e1f..6d74f31f6ea 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png index a8229181797..32186acdaa1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png index f57b63ecacb..09654a2cc3c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png index a8229181797..32186acdaa1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png index 52bb74a0dac..8cac72fc6f5 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png index e4c06d9d8f4..3c24c896e67 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json index 667cf5efc1a..dc98ecc2347 100644 --- a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/a138859aec54b20dac65eb76e94e9db1b2202f55 and modified by Swept", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47f6d91b37609b940152de62befa931dba35adf0", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png index 1e93bd9a76f..458b7255322 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png index 7e03504066f..e522858f14c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png index 1e93bd9a76f..458b7255322 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png index 7e03504066f..e522858f14c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png index 9421e661269..a57e1cf0d90 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png index 679bcc34aee..c1d14dfb973 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png index 9421e661269..a57e1cf0d90 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png index 87f2e5da7cb..6b15d22996c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png index d371695e129..9d8640f85b0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png index 9d8640f85b0..d371695e129 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json index 7484be2ffed..72f6d194f80 100644 --- a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json @@ -10,56 +10,17 @@ { "name": "alarm0", "directions": 4, - "delays": [ - [2.8, 2.8], - [2.8, 2.8], - [2.8, 2.8], - [2.8, 2.8] - ] + "delays": [ [ 2.8, 2.8 ], [ 2.8, 2.8 ], [ 2.8, 2.8 ], [ 2.8, 2.8 ] ] }, { "name": "alarm1", "directions": 4, - "delays": [ - [ - 0.6, 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, 0.6, 0.6, 0.6 - ], - [ - 0.6, 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, 0.6, 0.6, 0.6 - ], - [ - 0.6, 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, 0.6, 0.6, 0.6 - ], - [ - 0.6, 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, 0.6, 0.6, 0.6 - ] - ] + "delays": [ [ 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4 ], [ 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4 ], [ 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4 ], [ 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4 ] ] }, { "name": "alarm2", "directions": 4, - "delays": [ - [ - 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4, - 0.4, 0.4 - ], - [ - 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4, - 0.4, 0.4 - ], - [ - 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4, - 0.4, 0.4 - ], - [ - 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4, - 0.4, 0.4 - ] - ] + "delays": [ [ 0.6, 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, 0.6, 0.6, 0.6 ], [ 0.6, 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, 0.6, 0.6, 0.6 ], [ 0.6, 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, 0.6, 0.6, 0.6 ], [ 0.6, 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, 0.6, 0.6, 0.6 ] ] }, { "name": "alarm_b1", @@ -84,12 +45,12 @@ { "name": "auth_off", "directions": 1, - "delays": [[1]] + "delays": [ [ 1 ] ] }, { "name": "auth_on", "directions": 1, - "delays": [[0.1, 0.1]] + "delays": [ [ 0.1, 0.1 ] ] }, { "name": "fire0", @@ -106,22 +67,12 @@ { "name": "fire_2", "directions": 4, - "delays": [ - [0.5, 0.5], - [0.5, 0.5], - [0.5, 0.5], - [0.5, 0.5] - ] + "delays": [ [ 0.5, 0.5 ], [ 0.5, 0.5 ], [ 0.5, 0.5 ], [ 0.5, 0.5 ] ] }, { "name": "fire_3", "directions": 4, - "delays": [ - [0.3, 0.3], - [0.3, 0.3], - [0.3, 0.3], - [0.3, 0.3] - ] + "delays": [ [ 0.3, 0.3 ], [ 0.3, 0.3 ], [ 0.3, 0.3 ], [ 0.3, 0.3 ] ] }, { "name": "fire_b0", @@ -142,12 +93,7 @@ { "name": "fire_emagged", "directions": 4, - "delays": [ - [0.3, 0.3], - [0.3, 0.3], - [0.3, 0.3], - [0.3, 0.3] - ] + "delays": [ [ 0.3, 0.3 ], [ 0.3, 0.3 ], [ 0.3, 0.3 ], [ 0.3, 0.3 ] ] }, { "name": "fire_detected" @@ -159,12 +105,7 @@ { "name": "fire_on", "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, 0.2, 0.2], - [0.2, 0.2, 0.2, 0.2, 0.2, 0.2] - ] + "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, 0.2, 0.2 ], [ 0.2, 0.2, 0.2, 0.2, 0.2, 0.2 ] ] }, { "name": "fire_overlay" @@ -174,4 +115,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png b/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png index 4f9bf4c955d..c9f0b82f5d8 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/frosted_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/meta.json b/Resources/Textures/Structures/Windows/directional.rsi/meta.json index 5a01452c005..f93cacfa699 100644 --- a/Resources/Textures/Structures/Windows/directional.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/directional.rsi/meta.json @@ -1,47 +1,47 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "tgstation at ff1c30ac123dd28c6b5fee11e7f03654f5daa731, plasma windows from paradise at 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a, uranium windows made via edit by SphiraI(github), clockwork windows from https://github.com/tgstation/tgstation/blob/21b42d49ecf2b87f665b5f122368f6a247676721/icons/obj/smooth_structures/structure_variations.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "window", - "directions": 4 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bd91a1b962fe9bd38e346e9fafd4ebb10784fcb3/icons/obj/structures.dmi, uranium windows made via edit by SphiraI(github), clockwork windows from https://github.com/tgstation/tgstation/blob/21b42d49ecf2b87f665b5f122368f6a247676721/icons/obj/smooth_structures/structure_variations.dmi", + "size": { + "x": 32, + "y": 32 }, - { - "name": "reinforced_window", - "directions": 4 - }, - { - "name": "tinted_window", - "directions": 4 - }, - { - "name": "frosted_window", - "directions": 4 - }, - { - "name": "clock_window", - "directions": 4 - }, - { - "name": "plasma_window", - "directions": 4 - }, - { - "name": "plasma_reinforced_window", - "directions": 4 - }, - { - "name": "uranium_window", - "directions": 4 - }, - { - "name": "uranium_reinforced_window", - "directions": 4 - } - ] -} + "states": [ + { + "name": "window", + "directions": 4 + }, + { + "name": "reinforced_window", + "directions": 4 + }, + { + "name": "tinted_window", + "directions": 4 + }, + { + "name": "frosted_window", + "directions": 4 + }, + { + "name": "clock_window", + "directions": 4 + }, + { + "name": "plasma_window", + "directions": 4 + }, + { + "name": "plasma_reinforced_window", + "directions": 4 + }, + { + "name": "uranium_window", + "directions": 4 + }, + { + "name": "uranium_reinforced_window", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png b/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png index c1269b424e0..2c18ad87f17 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/plasma_reinforced_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png b/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png index b1d1f4fef52..92f31ef80dc 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/plasma_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png b/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png index 865f079317c..1be51d99327 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/reinforced_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png b/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png index 4f9bf4c955d..c9f0b82f5d8 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png and b/Resources/Textures/Structures/Windows/directional.rsi/tinted_window.png differ diff --git a/Resources/Textures/Structures/Windows/directional.rsi/window.png b/Resources/Textures/Structures/Windows/directional.rsi/window.png index a510742c941..b902ba8e9fb 100644 Binary files a/Resources/Textures/Structures/Windows/directional.rsi/window.png and b/Resources/Textures/Structures/Windows/directional.rsi/window.png differ