diff --git a/.github/workflows/validate-rsis.yml b/.github/workflows/validate-rsis.yml index 3647545f95..85e6173625 100644 --- a/.github/workflows/validate-rsis.yml +++ b/.github/workflows/validate-rsis.yml @@ -1,9 +1,10 @@ name: RSI Validator on: - pull_request: + pull_request: paths: - '**.rsi/**' + jobs: validate_rsis: name: Validate RSIs @@ -14,9 +15,9 @@ jobs: run: git submodule update --init - name: Pull engine updates uses: space-wizards/submodule-dependency@v0.1.5 - - name: Parse files - uses: space-wizards/json-schema-validator@v1.0.2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - json_schema: RobustToolbox/Schemas/rsi.json - json_path_pattern: .*meta.json$ + - name: Install Python dependencies + run: | + pip3 install --ignore-installed --user pillow jsonschema + - name: Validate RSIs + run: | + python3 RobustToolbox/Schemas/validate_rsis.py Resources/ diff --git a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json index e9e604644d..f46241eab5 100644 --- a/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json @@ -161,6 +161,10 @@ { "name": "tray-equipped-BELT", "directions": 4 + }, + { + "name": "x4-equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json index 79395547c5..dd2fdcc360 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json @@ -9,6 +9,10 @@ "states": [ { "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/hopcap.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/hopcap.png deleted file mode 100644 index 8b984bc048..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/hopcap.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/meta.json index d1eaa2d122..417f89d562 100644 --- a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/meta.json @@ -13,6 +13,14 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json index 11386a974a..707ed06d35 100644 --- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-MASK", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}, {"name": "equipped-MASK-dog","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-puppy","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-fox","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-cat","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-sloth","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-possum","directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "equipped-MASK-vox", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} +{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e","size":{"x":32,"y":32},"states":[{"name":"icon"},{"name":"equipped-MASK","directions":4},{"name":"inhand-left","directions":4},{"name":"inhand-right","directions":4},{"name":"equipped-MASK-dog","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-puppy","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-fox","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-cat","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-sloth","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-possum","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-vox","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"up-equipped-MASK","directions":4}]} diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png index ef7d82b493..fefdc0b7ea 100644 Binary files a/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png and b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json index 13e829951d..2755173124 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC BY-NC-SA 3.0", + "license": "CC-BY-NC-SA-3.0", "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/4059e4be90832b02b1228b1bee3db342094e4f1e", "size": { "x": 32, diff --git a/Resources/Textures/Decals/bricktile.rsi/meta.json.bak b/Resources/Textures/Decals/bricktile.rsi/meta.json.bak deleted file mode 100644 index 97ea935309..0000000000 --- a/Resources/Textures/Decals/bricktile.rsi/meta.json.bak +++ /dev/null @@ -1,164 +0,0 @@ -{ - "version": 1, - "license": "CC0-1.0", - "copyright": "Made by github user @moonheart08", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "steel_box" - }, - { - "name": "steel_corner_ne" - }, - { - "name": "steel_corner_se" - }, - { - "name": "steel_corner_nw" - }, - { - "name": "steel_corner_sw" - }, - { - "name": "steel_end_n" - }, - { - "name": "steel_end_e" - }, - { - "name": "steel_end_s" - }, - { - "name": "steel_end_w" - }, - { - "name": "steel_line_n" - }, - { - "name": "steel_line_e" - }, - { - "name": "steel_line_s" - }, - { - "name": "steel_line_w" - }, - { - "name": "steel_inner_ne" - }, - { - "name": "steel_inner_se" - }, - { - "name": "steel_inner_nw" - }, - { - "name": "steel_inner_sw" - }, - { - "name": "white_box" - }, - { - "name": "white_corner_ne" - }, - { - "name": "white_corner_se" - }, - { - "name": "white_corner_nw" - }, - { - "name": "white_corner_sw" - }, - { - "name": "white_end_n" - }, - { - "name": "white_end_e" - }, - { - "name": "white_end_s" - }, - { - "name": "white_end_w" - }, - { - "name": "white_line_n" - }, - { - "name": "white_line_e" - }, - { - "name": "white_line_s" - }, - { - "name": "white_line_w" - }, - { - "name": "white_inner_ne" - }, - { - "name": "white_inner_se" - }, - { - "name": "white_inner_nw" - }, - { - "name": "white_inner_sw" - }, - { - "name": "dark_box" - }, - { - "name": "dark_corner_ne" - }, - { - "name": "dark_corner_se" - }, - { - "name": "dark_corner_nw" - }, - { - "name": "dark_corner_sw" - }, - { - "name": "dark_end_n" - }, - { - "name": "dark_end_e" - }, - { - "name": "dark_end_s" - }, - { - "name": "dark_end_w" - }, - { - "name": "dark_line_n" - }, - { - "name": "dark_line_e" - }, - { - "name": "dark_line_s" - }, - { - "name": "dark_line_w" - }, - { - "name": "dark_inner_ne" - }, - { - "name": "dark_inner_se" - }, - { - "name": "dark_inner_nw" - }, - { - "name": "dark_inner_sw" - } - ] -} diff --git a/Resources/Textures/Interface/Alerts/human_health.rsi/health_numb.png b/Resources/Textures/Interface/Alerts/human_health.rsi/health_numb.png deleted file mode 100644 index 9dc3a511d7..0000000000 Binary files a/Resources/Textures/Interface/Alerts/human_health.rsi/health_numb.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/meta.json index 28c17164ad..b8d7bcd6c9 100644 --- a/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/meta.json +++ b/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/meta.json @@ -7,6 +7,18 @@ "y": 32 }, "states": [ + { + "name": "magic", + "directions": 4 + }, + { + "name": "tech", + "directions": 4 + }, + { + "name": "miner", + "directions": 4 + }, { "name": "magic_flare", "directions": 4 diff --git a/Resources/Textures/Mobs/Animals/penguin.rsi/meta.json b/Resources/Textures/Mobs/Animals/penguin.rsi/meta.json index c681783b92..7894ece42b 100644 --- a/Resources/Textures/Mobs/Animals/penguin.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/penguin.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CCBYNA3", "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", "states": [{"name": "penguin", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "penguin_baby", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "penguin_baby_dead", "delays": [[1.0]]}, {"name": "penguin_baby_dead_blood", "delays": [[1.0]]}, {"name": "penguin_dead", "delays": [[1.0]]}, {"name": "penguin_dead_blood", "delays": [[1.0]]}, {"name": "penguin_egg", "delays": [[1.0]]}, {"name": "penguin_egg_broken", "delays": [[1.0]]}, {"name": "penguin_shamebrero", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b","states":[{"name":"penguin","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"penguin_baby","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"penguin_baby_dead","delays":[[1.0]]},{"name":"penguin_baby_dead_blood","delays":[[1.0]]},{"name":"penguin_dead","delays":[[1.0]]},{"name":"penguin_dead_blood","delays":[[1.0]]},{"name":"penguin_egg","delays":[[1.0]]},{"name":"penguin_egg_broken","delays":[[1.0]]},{"name":"penguin_shamebrero","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]}]} diff --git a/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json b/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json index 13d75508c3..5a430a2a37 100644 --- a/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json +++ b/Resources/Textures/Mobs/Ghosts/revenant.rsi/meta.json @@ -93,7 +93,7 @@ 0.05 ], [ - 0.05 + 1.1 ], [ 0.05, diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-lining.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-lining.png deleted file mode 100644 index 7013e61434..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-lining.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-open.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-open.png deleted file mode 100644 index 3d9d4a4cae..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox.png deleted file mode 100644 index ca9dd9926b..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox1.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox1.png deleted file mode 100644 index 70ea0a4c29..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json index 8c24d694c3..f42362b254 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json @@ -129,6 +129,14 @@ }, { "name": "vegetable-slice" + }, + { + "name": "box-inhand-right", + "directions": 4 + }, + { + "name": "box-inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/ultrabite.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/ultrabite.png deleted file mode 100644 index c9126498fa..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/burger.rsi/ultrabite.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer - Copy.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer - Copy.png deleted file mode 100644 index 220b402f25..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer - Copy.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json index 2dd2de560a..5aca929f98 100644 --- a/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json @@ -25,6 +25,9 @@ { "name": "box-trash" }, + { + "name": "box-closed" + }, { "name": "tin-closed" }, diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index 6b1a633585..bfd0e069f3 100644 --- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json @@ -47,6 +47,9 @@ { "name": "walkietalkie-on" }, + { + "name": "walkietalkie-off" + }, { "name": "walkietalkie-active" }, diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/pianobroken.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/pianobroken.png deleted file mode 100644 index 210211f3e7..0000000000 Binary files a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/pianobroken.png and /dev/null differ diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json index 8efba5e0dc..0f883ee280 100644 --- a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json @@ -19,6 +19,18 @@ { "name": "death_cap" }, + { + "name": "clown" + }, + { + "name": "clown2" + }, + { + "name": "clown2_cap" + }, + { + "name": "clown_cap" + }, { "name": "mime" }, diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json index eeddeb3119..990bbf9356 100644 --- a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f", "size": { "x": 32, diff --git a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json index ec77ada562..ad615418d3 100644 --- a/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "ripley_chassis" + }, { "name": "ripley_harness" }, @@ -95,4 +98,4 @@ "name": "ripley18" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Specific/Xenoarchaeology/item_artifacts.rsi/meta.json b/Resources/Textures/Objects/Specific/Xenoarchaeology/item_artifacts.rsi/meta.json index 4a13058714..82b10cdf2e 100644 --- a/Resources/Textures/Objects/Specific/Xenoarchaeology/item_artifacts.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Xenoarchaeology/item_artifacts.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-NC-SA 3.0", + "license": "CC-BY-NC-SA-3.0", "copyright": "goonstation at 4059e4be90832b02b1228b1bee3db342094e4f1e. ano11/ano11_on and inhands by brainfood#7460", "size": { "x": 32, diff --git a/Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json index 03b496d7b7..53eb12dce1 100644 --- a/Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/donkpocket.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "license": "CC-BY-NA 3", + "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", "states": [ { diff --git a/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json b/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json index 97ce32a860..d1fcdea7f4 100644 --- a/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/cable-coils.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC BY-SA 3.0", + "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation and modified by SweptWasTaken at commit https://github.com/tgstation/tgstation/commit/77608a9f46b06a46f0f6b1be061755f68cc255a3", "size": { "x": 32, diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json index 69fb27b148..75650c1928 100644 --- a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json @@ -86,6 +86,10 @@ 0.2 ] ] + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staffofchange.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staffofchange.png deleted file mode 100644 index 7cfdc6551f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staffofchange.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json index 610e48fd9b..b2cdaede10 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json @@ -16,6 +16,9 @@ { "name": "mag-0" }, + { + "name": "suppressor" + }, { "name": "inhand-left", "directions": 4