From a742f4a7823c722cf2c9383a9720ebd9a0aaf352 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Wed, 4 Sep 2024 18:59:23 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Decals/wheelchair.rsi/meta.json | 2 +- .../LobbyScreens/attributions.yml | 18 +++--- .../Objects/Fun/toys.rsi/meta.json | 6 +- ...nd-right.png => disabler-inhand-right.png} | Bin .../Weapons/Guns/Battery/soleil.rsi/meta.json | 61 ++++++++++++++++++ 5 files changed, 74 insertions(+), 13 deletions(-) rename Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi/{siabler-inhand-right.png => disabler-inhand-right.png} (100%) create mode 100644 Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi/meta.json diff --git a/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json b/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json index af45c52852..331e12ade9 100644 --- a/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Decals/wheelchair.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 2, - "license": "CC BY-NC-ND 4.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Draw by Skilets: https://github.com/Skilets", "size": { "x": 32, diff --git a/Resources/Textures/_LostParadise/LobbyScreens/attributions.yml b/Resources/Textures/_LostParadise/LobbyScreens/attributions.yml index c24905cb2f..cf1072aa70 100644 --- a/Resources/Textures/_LostParadise/LobbyScreens/attributions.yml +++ b/Resources/Textures/_LostParadise/LobbyScreens/attributions.yml @@ -1,44 +1,44 @@ - files: ["borman.png"] - license: "CC BY-NC-ND 4.0" + license: "CC-BY-NC-SA-4.0" copyright: "Discord - bormann64/1070387950791184535" source: "https://discord.gg/v5mGmMzAdB" - files: ["teftelka.png"] - license: "CC BY-NC-ND 4.0" + license: "CC-BY-NC-SA-4.0" copyright: "Telegram - @push1nkaa" source: "https://discord.gg/v5mGmMzAdB" - files: ["amina.png"] - license: "CC BY-NC-ND 4.0" + license: "CC-BY-NC-SA-4.0" copyright: "Discord - insulgon/361486758980091916" source: "https://discord.gg/v5mGmMzAdB" - files: ["bigmoon.png"] - license: "CC BY-NC-ND 4.0" + license: "CC-BY-NC-SA-4.0" copyright: "Discord - canceredpussy/626790677845508146" source: "https://discord.gg/v5mGmMzAdB" - files: ["girls.png"] - license: "CC BY-NC-ND 4.0" + license: "CC-BY-NC-SA-4.0" copyright: "Discord - canceredpussy/626790677845508146" source: "https://discord.gg/v5mGmMzAdB" - files: ["clara.png"] - license: "CC BY-NC-ND 4.0" + license: "CC-BY-NC-SA-4.0" copyright: "Discord - the_kira_san/523852516128063519" source: "https://discord.gg/v5mGmMzAdB" - files: ["kirashet.png"] - license: "CC BY-NC-ND 4.0" + license: "CC-BY-NC-SA-4.0" copyright: "Discord - the_kira_san/523852516128063519" source: "https://discord.gg/v5mGmMzAdB" - files: ["darkmoon.png"] - license: "CC BY-NC-ND 4.0" + license: "CC-BY-NC-SA-4.0" copyright: "Discord - darkmoonmilkyway/692645506186215425 Vk - @dark_moon_house" source: "https://discord.gg/v5mGmMzAdB" - files: ["breaddot_nukies.png"] - license: "CC BY-NC-ND 4.0" + license: "CC-BY-NC-SA-4.0" copyright: "Discord - cum_inflation/757254408173125702 TG - breaddotdoodles" source: "https://discord.gg/v5mGmMzAdB" diff --git a/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json index 9b8592a075..4bbe9fa5c2 100644 --- a/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC BY-NC-ND 4.0", - "copyright": "Taken from BlueMoon github https://github.com/BlueMoon-Labs/SERP-BlueMoon-Station-13", + "license": "CC-BY-NC-SA-4.0", + "copyright": "Taken from BlueMoon github https://github.com/BlueMoon-Labs/SERP-BlueMoon-Station-13 (changed license for no errors)", "size": { "x": 32, "y": 32 @@ -239,5 +239,5 @@ "name": "pebbles-inhand-right", "directions": 4 } - ] + ] } diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi/siabler-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi/disabler-inhand-right.png similarity index 100% rename from Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi/siabler-inhand-right.png rename to Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi/disabler-inhand-right.png diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi/meta.json new file mode 100644 index 0000000000..e9792ef9ea --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi/meta.json @@ -0,0 +1,61 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By lost paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mode-disabler" + }, + { + "name": "mode-lethal" + }, + { + "name": "mode-stun" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "disabler-inhand-left", + "directions": 4 + }, + { + "name": "disabler-inhand-right", + "directions": 4 + }, + { + "name": "lethal-inhand-left", + "directions": 4 + }, + { + "name": "lethal-inhand-right", + "directions": 4 + } + ] +}