From 14f8b4e6d5a9ef2d1e031cf39378157ff695bede Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 20 Dec 2022 06:31:17 +0100 Subject: [PATCH] Use new validate-rsis for workflow (#12997) * Use new validate-rsis for workflow * A * Add python deps * --ignore-installed * Make it only work on RSI changes again. * Fix a bunch of RSIs. --- .github/workflows/validate-rsis.yml | 15 +- .../Clothing/Belt/belt_overlay.rsi/meta.json | 4 + .../Headsets/servicesecurity.rsi/meta.json | 4 + .../Clothing/Head/Hats/hopcap.rsi/hopcap.png | Bin 324 -> 0 bytes .../Head/Hats/outlawhat.rsi/meta.json | 8 + .../Clothing/Mask/breath.rsi/meta.json | 2 +- .../Mask/breath.rsi/up-equipped-MASK.png | Bin 156 -> 873 bytes .../Uniforms/Jumpsuit/rainbow.rsi/meta.json | 2 +- .../Decals/bricktile.rsi/meta.json.bak | 164 ------------------ .../Alerts/human_health.rsi/health_numb.png | Bin 256 -> 0 bytes .../Aliens/Guardians/guardians.rsi/meta.json | 12 ++ .../Mobs/Animals/penguin.rsi/meta.json | 2 +- .../Mobs/Ghosts/revenant.rsi/meta.json | 2 +- .../Food/Baked/donut.rsi/newbox-lining.png | Bin 125 -> 0 bytes .../Food/Baked/donut.rsi/newbox-open.png | Bin 187 -> 0 bytes .../Food/Baked/donut.rsi/newbox.png | Bin 172 -> 0 bytes .../Food/Baked/donut.rsi/newbox1.png | Bin 120 -> 0 bytes .../Consumable/Food/Baked/pizza.rsi/meta.json | 8 + .../Consumable/Food/burger.rsi/ultrabite.png | Bin 816 -> 0 bytes .../condiments.rsi/packet-layer - Copy.png | Bin 219 -> 0 bytes .../Objects/Consumable/Food/mre.rsi/meta.json | 3 + .../Devices/communication.rsi/meta.json | 3 + .../structureinstruments.rsi/pianobroken.png | Bin 1521 -> 0 bytes .../Objects/Fun/spraycans.rsi/meta.json | 12 ++ .../Misc/fire_extinguisher.rsi/meta.json | 2 +- .../Mech/ripley_construction.rsi/meta.json | 5 +- .../item_artifacts.rsi/meta.json | 2 +- .../Objects/Storage/donkpocket.rsi/meta.json | 2 +- .../Objects/Tools/cable-coils.rsi/meta.json | 2 +- .../Tools/welder_experimental.rsi/meta.json | 4 + .../Guns/Basic/staves.rsi/staffofchange.png | Bin 2331 -> 0 bytes .../Weapons/Guns/Pistols/viper.rsi/meta.json | 3 + 32 files changed, 81 insertions(+), 180 deletions(-) delete mode 100644 Resources/Textures/Clothing/Head/Hats/hopcap.rsi/hopcap.png delete mode 100644 Resources/Textures/Decals/bricktile.rsi/meta.json.bak delete mode 100644 Resources/Textures/Interface/Alerts/human_health.rsi/health_numb.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-lining.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox-open.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/newbox1.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/burger.rsi/ultrabite.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer - Copy.png delete mode 100644 Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/pianobroken.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staffofchange.png 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 8b984bc048be28d1b224b7999cfd2778de0c20b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmV-K0lWT*P)Lq;*>pSH<-~7595e=---Qg0jyZXGW(b59s=$f7U0m|? z@lO0uk*5D3P-EjbCP@;CqG&gxC?d-;@;vwM=_~L>qM_^Xt^xqReMntnD0000V=2I20U2 z7rzGo16>7I1wl{*5hwouzZNO+y{6D2?H!l*$CG9T;!hnkyRf{rf?~B)c%P5hD(bq-=oE!xd$r~lLOkFjqI_Vls0~L|` z|2!RiX4>x_N&wxjp7%Kc^y~w*s^|TldS2}e2)+QC#Ym>Qcd5*9y(UqE2M#sTmP_%U1v4pc}d76u1q;v#V|3``Bn(`(Wu)RG4KYN-AH zw!&-g-SNtDM+5)>0FY5i)B@YKcdj4$eR11v|G018=bEO)+F&sLY&H{?W$D3nhG9(V z_4>i_^M`Ea-ZVwmH2okKwVHUF&)sWIKKOkSUdCg(GtFtp-srmk$)5mDvN;&gRjEX3 zu}IE(P0yv!RdWQaLS`MOq6G`6n20gq5&YBr_*~@vqOPAhQJk00000000000001hlsLFO z{<+=yjnKzlkAedePm9G)yIkgk$g8S~>q>>Zp$x|J3OAjOzviS+*vTm>e(av!rKW`r zOn60*RRB&tY$#)D+p%(p-5cZ+@ID&38ww^blQ)mx#o(AS#&Pm8Hpc@KL*c)GhgIXFE0`nCVW ziJOlf7uVLV*|lqJowF8D4P!}=UoeBivm0qZj*+K}V~EDYqTD&M!_7YGxgQu&X%Q~loCIF_H BGg<%u 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 9dc3a511d7a7962d547811153a1322807823fcae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$DvS0JsfuI}jQ7!(wg#=uZh zQ?p{livJ7@*8I;N1LYV?g8YIR9G=|($}vpyba4#P2wr;Dkn6Ak4{JbY%mJk()iq5G zwant1t~J**zhG&M+y5!)v}TFN)|Vfb@)uN}I4E+aZ;qnfc0TWimG$b(MJ*ea=QdQZ zF`rRh5Wjpv6>nD4qfEUnj`Mq2B3=6Kl+{KGzo}{v`E*HX#zv-p4eN!~(##lI?)?^x z_CA}zbS9y4D))}#`yE8v!dP#2yYzKDcvi#UKV5D8Dv78RpbHs1UHx3vIVCg!04z6N A1poj5 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 7013e6143425807c7440d937e8e072b1aef5dbe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*8>L*Y~Q}Up`l^^oXw^{ zLB^6GzhDN3XE)M-93@W|#}J9B$q5n?0$eP74zmQ0Bs3TuIuNuvY;BaG!@5H(41yYL V&w9SJX9HC;c)I$ztaD0e0sxC!BWnNv 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 3d9d4a4cae695fba93e59c93f4f91e5937ce5ec8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*8>L*xVgDCG&F4AzWvs% zTPZ0i|NsB@HovS1RKQpgbP0l+XkKEB`r# 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 ca9dd9926b8835c03f276dec12e00c9073aebc48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*8>L*xVgFg|NsBity>KZ z4Jj!p`?aqs17#UYg8YIR9G=}s19Ch(T^vI+CMG9Hq&W!iDb%>BY6O_HaBv)CX}QP} zlEAcRp@0B~Fh|p@6*4@+4OxzY0xseQ0vH7a8aOzlof{Q)oo3AtGI+ws(EUqT!a4C! Q5ztHqPgg&ebxsLQ06||d!vFvP 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 70ea0a4c29b085ba5d1511103eb2f56207727d73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzdrud~kcif|=XUcl7;rc{YG)f7 zDjV`Bc}-_M;a+up$7WpyhI!Lw7JcvPFxqVOuT(z%=0-y+ul-g)z3(QOFlIj$dspZi Rv=hi>@O1TaS?83{1OQwuB(MMg 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 c9126498fa70f6ed0798e237ca3ec2a70548d519..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 816 zcmV-01JC@4P)RJVh}3{eD{NUo!72q9 z43sTn0Rb**q!AbO%sk|Q^WQX^&RzORkuT4edoOqI`|i$qIDepNc*AzOj0M97tMNd< z>*o-k?$+_13)|Vdra~;!8SsYfbQSS5tYe?QH52j5lzhKalID?DFup`z;wn5m*~GHGFdv55P3MyY7z0o#v}u7H8iz(5d;Qo24QlN8St zPkysj56Fxl_d?hccmoUR>SvDS@0*0t40s2Mai|SeJSo42p`h9n%O-6388wMj?-m94) zT}>K{(kHm7360aRAY3768MpnI_`+;QG!n3L^1j&JaznaPRqL~i-yE;84xBAiX|^F8 zyNXUv)Ux9EO5lf!qTgCKqg5u1W{UZh7BjyB>6Gulybv|213;1Q@~`9HdOR!(eFND`+DQ)cOQW=J*6wa zF<%0s8TcBt)8Imjs2MUW+mIC`^pYKQ);I&8|Gjj@>Z(|YV3guqI~;Y)#x>dv$DuB>ArY-_r#f;SRuFJiS1s4z zdC^+bJ@1-pxMkC!_IXOG+_@av9(rF2GRikTB>(jMg2fVTiGO4bk9pd;O!GdyOyE#R zw{FRqc{{xr%tK}GFS)b#`<0otlX(>MgI&wG|4J~git@2|E_c+|>-w6_0p$s+53Mg# z2;X}xvhE(^sRLoH*BU?XVPbH0m5#P@==H7aeVmjgdDHODk$d|WCQ7KgyUcr~k?$yN S(tQ!=S_V&7KbLh*2~7YtbyZpb 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 210211f3e757b537c640cbb9866afe5860542954..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1521 zcmVMmd-k?P-eZEIJR93McBn|yyR0_`rdj?|fh0 z=Y8Hk-}k|5K&UIIXb-^fV3%_0Xp^#=wZi`~c>I`8dGMqG0I47$6(qy=pwG;$82J2N zC7sHcw)-#he=&UIkXr#*THYX^%ahOLk!9KN96#n$_K5WWgj!^FQexK%gt~&t(sB}j zSX{?~)mf71`hRg3sQwFg`xc^z<~>u3f|D_bR(0pc$8C+2E-LZLAXK&J6Ny zr-N8rW@&i?fPsMl0Q&m+^m)4qLAmi-uvzUCH`cLP?R4*J+|nhKKu%%x;{+XTAzH3F&v!^6V_ zgF$_bu0W_OsF*jB%*NMDT0K`v5751@k%{S2mG^#^%*1pFL2&8c5}OvHu_6bXRl?V= zU$1h;tQpsm48XjR)Jv?~xXo&3V!A~C0dviebhd69-nCwl*tD>mFLLtaNlu?WO*Wg| zQlK))yuM}y3a^a0+fe`-4c=>*OIQ%fvMQ5FlgYs6JvJ`>E&)>jjNKSBDp2WZDksp> zVa!i0^Oq&3p4B_SZmYv?tK-`n5+A%-;^rSWi9{nrqLD2EQbDTeZ7eS1cga;m0Gi!a zgZDih0;$~Ayywot0IV0+bRq!f&!6YQg$sB*o-G1Tlg~^xs~x{fu4*Q!oIort^Uk4q zeXO{#&e4{w_TJN>&M8MzVUlxa2KDzwQ4Lu*9A;=}$dCi(P+6Ni(e0_J#>8~VkYKlx ziaxK>xQ5GDuT+f<3=C8$AOL*%@mn~YKEvek#YIv%L04riVWG2ilV*24GmlmPp{DoS zVe0-Ak!ZwN1=H8w1vEq)#{VtiqdrRC+ z!f*eWi9{oKJRaKLXg3mYITh+G4k8Z{IGjGDLK@C%^kL}%+Jx02>< zjjKs`pHxm@^0CB`y+Df^f4RLs#9Ugz z>qztc?Wpc;`58bRQ%RJUU?tXzYm~$mAg6m>4l_VLm*G-Fv;pWUbY-DzTDZq1A0A5{_ons~gsg19-hYq=Hn{ zFXj^9cdfB3spG5pOcjY{r(Ms1p`jt80-!b+?VOh`co1D8qDw>&1pNW%>n`c4;_ll?a)hYsR(MC8NX6(k8Ar!*H*?Ci_E2!jidA+&hb9sG&=n@To^x#PY z4z(&t7aW*L>fhoiJ01RY=F=r=A)C$W`+!EGX7I|pVL6%FaN>64C|O%{QeXX?1x(m& zb^3k)>Ru2C1Q;0^(Z>W(PpFy-l>{nVbFK5>vgD+=k*=aV!m7&RN2^peSNYf%p)#<*`60?{SzB1ErV z`*3#NRCR6I(-KggCZFl!p&FM8*b3WDhP32%)H{(@3%VlO#bn!i+v|YW*Q`_$$fTEa zyW1YiPaSPiw6N?3YsFRN_MLI%_MLHkO(wl$vRUoOvRq|+SL|z%de!x8JM3u*)Lio~ Xxg^d5P|m!h00000NkvXXu0mjfQi<`@ 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 7cfdc6551f50bc2f54b3c25690d3df4bb65a3d9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2331 zcmaKuXHe5?7RLV}QbaI{ctt>iprTQ#)EJY{jFf>$)6jxMF^Dv!NJ&vqTt!1ssgfYg z3z|srVkKY$K@lW?B28%t;7~#csVus8W_R!1*$?M^&b)Izz2`jd@B9Pnj!{?DRs{e+ z-T9EC=ZaESf}x_ca=y+wE?be+(T8wn0buRxp8>kHXRQtZsC;mCwDUe!_~Qw}WL~k2N0Kq^mkyUB?MJalHP#6m(>FNOoNeHtxs9-D)s00$*UF}923u+7z80i4iMN5*Xtu2dR29oOy!f7WYZ+ZKywbZQg$-V^e@%?itHMVXz zATNI8BBYppgnITcZ8>y#N-F#|EN`WEw*X}dpP{1Wx~0`_t%zKf~J2E;P?x#)>} z*D^{>%(wozCYy5PXW4LILar>xhy4c#D;iVyEa5?{b=O+A_t)9lkA%B|(hrt!#mfFO z5r~wzGiowEpTA2iuXdnVcQvy;BzR^iz6}@*W8VWb8^^~(2Q}uzdRY>X>Tt(E!hRaP za!Nu%!j}07gME)J#Rq{79{c?WK;MWN!; z7i&Q|ER##D2l#+V#U9p>V&U^M+J1Mh*y&!*xD%a^McpIIs;JYRBd2SOWa^HDjS7NS zlhzFoYUj@QMwGyD&#Fn~E>;Avywf4EZukD;#90oc3MzdD2#^_KJAvp#Mhr)tN_L6# ze!L1xX=r!~8ug92>AHQgx95m8`hBOFU}_4p8LV5a;a3HXSaaj5J`_>AB?VI<|Jzmz{1W7@7Te>l;xe!WCE%DvN$n-D_!}S4Urx923Xom2;C#d>5 zke#B~b^D+mvD`r^uzlB^f|c5`Y(6+6IyRCFXxx6Za>2QXSJtWM=7U>u^}DZ^al}WM z0q;zz>4?O;K^yzYtX2wgTWY%kf2~QZAKn={~pkVUy0~C848$uE$h0rcO6J8a50$dL57%4uQ z=TMf5dt)27VM%O&=*``{u2ViF7nyj(8}P0RI{?)d*u>}Cj*rgLH8%n^zT$wY{kx_J zWie)SHiW8#)r%6~np^{dV8e^Fp&gxRA^^74Xedny%b2V-*OV@nWJ{}SU2}|&xtXRv zfINiw`}@B+vtU70AfMjKKFmcIUDEA;GTwi(o>SgaP(_!GiZ9y9wbdDp-5cI=bNIIt zWKWa01RO~leZKM~hP{^}oH%;ufd_b1dFAYwcY067f$KqmByBxYpR?PSzV`Jl#|gp! zMNehdNp2VLHZPo7G?&t#7^=-UiJ(Vaase--SHv34T?QrHPw{fwywU}{in(;R=W}~* z*iyOL!*?m8eR&9R@LkGXNKSZoXcqk$jAX2rmcpb)GoWq;l7BR z6El{=re4bEo7yRE$^122#Twyvw+nFvbGK&m3al_*-fE_M=r>v^OW(&nx3!=;v^IG2 z@a=y%L0RENt6RnPTSzl?bn8L~VG_t#G;Ig)E43Ifx^X)#Gm~C{zm*wPiyXYxiUGr8 zS^DGWLR7VD;`uO1We9bi5J+5a6XyIbz3GKkx|nc` z*^MSTHG)pdkj6A5blJmPKA%_FPwP<=uDPAoYi#980?h zaB6#n7YY&QhW!c@^Ld=!ChI1|DV<C zVk4`+hnkZnzH0~fJmpt+7*m~=c>S6;yPAq|M1Z0^e|*jDE$X=*tP=XB#$RB{h>biY zLxe()Qp!Qn(@&=xi599w9{5t4w~>CgCt$W9Bc#bA%V`w)BHOK!MkOwYRse>M51yFo zVu%)CQY7>i-VL_i`Cr7zJ&E=oLM_%bJl`5Y22cgYErjOcd0rcLWVlmfczkK~Fiyqv5>dW3svgG} 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