From dc11ebf7609f4f358dabf1f18fd35d29e27f4f26 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 9 Mar 2021 22:06:17 +0100 Subject: [PATCH] Fix all broken RSI files. --- .../Mobs/Back/corgi_back.rsi/meta.json | 7 +-- .../Structures/Doors/effects.rsi/meta.json | 1 + .../Interface/Misc/health_bar.rsi/meta.json | 4 +- .../Textures/Mobs/Animals/chick.rsi/meta.json | 20 ++------- .../Consumable/Food/burger.rsi/icon.png | Bin 272 -> 241 bytes .../Objects/Fun/spraycans.rsi/meta.json | 3 -- ...arkerbronze_on.png => markerbronze-on.png} | Bin ...rburgundy_on.png => markerburgundy-on.png} | Bin ...rcerulean_on.png => markercerulean-on.png} | Bin ...kerfuchsia_on.png => markerfuchsia-on.png} | Bin ...arkerindigo_on.png => markerindigo-on.png} | Bin .../{markerjade_on.png => markerjade-on.png} | Bin .../{markerlime_on.png => markerlime-on.png} | Bin ...{markerolive_on.png => markerolive-on.png} | Bin ...arkerpurple_on.png => markerpurple-on.png} | Bin .../{markerteal_on.png => markerteal-on.png} | Bin ...arkerviolet_on.png => markerviolet-on.png} | Bin ...arkeryellow_on.png => markeryellow-on.png} | Bin .../Chemistry/autoinjector.rsi/meta.json | 2 +- .../Chemistry/hypospray.rsi/meta.json | 42 +++++++++++++++++- .../Tools/Hydroponics/disk.rsi/meta.json | 11 +---- 21 files changed, 54 insertions(+), 36 deletions(-) rename Resources/Textures/Objects/Misc/markers.rsi/{markerbronze_on.png => markerbronze-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markerburgundy_on.png => markerburgundy-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markercerulean_on.png => markercerulean-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markerfuchsia_on.png => markerfuchsia-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markerindigo_on.png => markerindigo-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markerjade_on.png => markerjade-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markerlime_on.png => markerlime-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markerolive_on.png => markerolive-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markerpurple_on.png => markerpurple-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markerteal_on.png => markerteal-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markerviolet_on.png => markerviolet-on.png} (100%) rename Resources/Textures/Objects/Misc/markers.rsi/{markeryellow_on.png => markeryellow-on.png} (100%) diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json index c45974f6fd..7126cd166e 100644 --- a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json +++ b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json @@ -39,8 +39,9 @@ "name": "petcollar", "directions": 4 }, - { - "name": "walkietalkie", - "directions": 4 + { + "name": "walkietalkie", + "directions": 4 + } ] } diff --git a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/meta.json b/Resources/Textures/Constructible/Structures/Doors/effects.rsi/meta.json index 919f9154a1..98cd4f94d7 100644 --- a/Resources/Textures/Constructible/Structures/Doors/effects.rsi/meta.json +++ b/Resources/Textures/Constructible/Structures/Doors/effects.rsi/meta.json @@ -12,6 +12,7 @@ }, { "name": "closed_unlit" + }, { "name": "closing_unlit", "delays": [ diff --git a/Resources/Textures/Interface/Misc/health_bar.rsi/meta.json b/Resources/Textures/Interface/Misc/health_bar.rsi/meta.json index 5e25e6c752..9a6f00e2c2 100644 --- a/Resources/Textures/Interface/Misc/health_bar.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/health_bar.rsi/meta.json @@ -1,8 +1,8 @@ { "version": 1, "size": { - "x": 7, - "y": 24 + "y": 7, + "x": 24 }, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/blob/886ca0f8dddf83ecaf10c92ff106172722352192/icons/effects/progessbar.dmi", diff --git a/Resources/Textures/Mobs/Animals/chick.rsi/meta.json b/Resources/Textures/Mobs/Animals/chick.rsi/meta.json index aa6b064a96..9d0563f26d 100644 --- a/Resources/Textures/Mobs/Animals/chick.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/chick.rsi/meta.json @@ -16,25 +16,11 @@ ] }, { - "name": "cow", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "name": "chick", + "directions": 4 }, { - "name": "chick_gib", + "name": "gib", "delays": [ [ 0.6, diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/icon.png index 85356dcd5f0750289b0991df9ac264aaf2bdccd9..23ec309118e18bfd97647ad85d35e3509b586350 100644 GIT binary patch delta 96 zcmbQh^pSCbxVQofGXn!dV@UdOAjMc5+k&dLzzK;Hm>IGnL=orq delta 127 zcmey!IDu(`xQ;vvGXn!dNyVl8K#H+A$lZzY=1HA;AcwQSBeIx*fm;}a85w5Hk(j7w zpu}Ag?@%F diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json index f3c2067526..81590bb254 100644 --- a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "death_cap" }, - { - "name": "green" - }, { "name": "mime" }, diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerbronze_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerbronze-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerbronze_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerbronze-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerburgundy_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerburgundy-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markercerulean_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markercerulean-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markercerulean_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markercerulean-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerindigo_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerindigo-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerindigo_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerindigo-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerjade_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerjade-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerjade_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerjade-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerlime_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerlime-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerlime_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerlime-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerolive_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerolive-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerolive_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerolive-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerpurple_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerpurple-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerpurple_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerpurple-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerteal_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerteal-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerteal_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerteal-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerviolet_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerviolet-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markerviolet_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markerviolet-on.png diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markeryellow_on.png b/Resources/Textures/Objects/Misc/markers.rsi/markeryellow-on.png similarity index 100% rename from Resources/Textures/Objects/Misc/markers.rsi/markeryellow_on.png rename to Resources/Textures/Objects/Misc/markers.rsi/markeryellow-on.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/meta.json index c14ea7be4d..13101451a7 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "0", "delays": [[1.0]]}, {"name": "1", "delays": [[1.0]]}, {"name": "10", "delays": [[1.0]]}, {"name": "15", "delays": [[1.0]]}, {"name": "5", "delays": [[1.0]]}, {"name": "autoinjector", "delays": [[1.0]]}, {"name": "autoinjector0", "delays": [[1.0]]}, {"name": "autoinjector_black", "delays": [[1.0]]}, {"name": "autoinjector_black0", "delays": [[1.0]]}, {"name": "autoinjector_red", "delays": [[1.0]]}, {"name": "autoinjector_red0", "delays": [[1.0]]}, {"name": "borghypo", "delays": [[1.0]]}, {"name": "borghypo_s", "delays": [[1.0]]}, {"name": "broken", "delays": [[1.0]]}, {"name": "combat_hypo", "delays": [[1.0]]}, {"name": "draw", "delays": [[1.0]]}, {"name": "hypo", "delays": [[1.0]]}, {"name": "inject", "delays": [[1.0]]}, {"name": "syringeproj", "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"autoinjector","delays":[[1.0]]},{"name":"autoinjector0","delays":[[1.0]]},{"name":"autoinjector_black","delays":[[1.0]]},{"name":"autoinjector_black0","delays":[[1.0]]},{"name":"autoinjector_red","delays":[[1.0]]},{"name":"autoinjector_red0","delays":[[1.0]]}]} diff --git a/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/meta.json index c14ea7be4d..90c528a760 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/meta.json @@ -1 +1,41 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "0", "delays": [[1.0]]}, {"name": "1", "delays": [[1.0]]}, {"name": "10", "delays": [[1.0]]}, {"name": "15", "delays": [[1.0]]}, {"name": "5", "delays": [[1.0]]}, {"name": "autoinjector", "delays": [[1.0]]}, {"name": "autoinjector0", "delays": [[1.0]]}, {"name": "autoinjector_black", "delays": [[1.0]]}, {"name": "autoinjector_black0", "delays": [[1.0]]}, {"name": "autoinjector_red", "delays": [[1.0]]}, {"name": "autoinjector_red0", "delays": [[1.0]]}, {"name": "borghypo", "delays": [[1.0]]}, {"name": "borghypo_s", "delays": [[1.0]]}, {"name": "broken", "delays": [[1.0]]}, {"name": "combat_hypo", "delays": [[1.0]]}, {"name": "draw", "delays": [[1.0]]}, {"name": "hypo", "delays": [[1.0]]}, {"name": "inject", "delays": [[1.0]]}, {"name": "syringeproj", "delays": [[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "borghypo", + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "borghypo_s", + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "combat_hypo", + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "hypo", + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json index ab98f8e78a..b28a6cfba1 100644 --- a/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json @@ -8,15 +8,8 @@ }, "states": [ { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "icon" + "name": "disk", + "delays": [[0.1, 0.1, 0.1]] } ] }