From eeb35709f123e322628149b1b60778e0d0d14a80 Mon Sep 17 00:00:00 2001 From: RedBurningPhoenix Date: Fri, 30 Aug 2024 22:04:06 +0500 Subject: [PATCH] RSI --- .../CustomGhostVisualizer.cs | 5 ++- .../CustomGhostSpriteSystem.cs | 44 ++++++++----------- .../CustomGhostSystem/CustomGhostPrototype.cs | 5 +-- .../_White/Ghosts/17shu-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/4abere1-ghost.rsi/meta.json | 4 +- .../Ghosts/aeons_torn-ghost.rsi/meta.json | 4 +- .../_White/Ghosts/afanasy-ghost.rsi/meta.json | 4 +- .../Ghosts/animeshka-ghost.rsi/meta.json | 2 +- .../Ghosts/cheese_cheese-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/dageff-ghost.rsi/meta.json | 4 +- .../Ghosts/deadisko-ghost.rsi/meta.json | 4 +- .../_White/Ghosts/doommax-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/felix-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/fjor-ghost.rsi/meta.json | 4 +- .../Ghosts/frostnova-ghost.rsi/meta.json | 4 +- .../_White/Ghosts/hayras-ghost.rsi/meta.json | 6 +-- .../Ghosts/hitpanda_ghost.rsi/meta.json | 4 +- .../_White/Ghosts/hskveez-ghost.rsi/meta.json | 4 +- .../_White/Ghosts/joulerk-ghost.rsi/meta.json | 4 +- .../_White/Ghosts/kreses-ghost.rsi/meta.json | 4 +- .../Ghosts/krokozyabra-ghost.rsi/meta.json | 4 +- .../Ghosts/mapperian-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/merkkaa-ghost.rsi/meta.json | 2 +- .../Ghosts/mikvisan-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/mr_regari.rsi/meta.json | 4 +- .../Ghosts/nairsark-ghost.rsi/meta.json | 2 +- .../Ghosts/nexmachina-ghost.rsi/meta.json | 2 +- .../Ghosts/nosireapo-ghost.rsi/meta.json | 4 +- .../_White/Ghosts/omntns-ghost.rsi/meta.json | 4 +- .../Ghosts/persikvin-ghost.rsi/meta.json | 4 +- .../Ghosts/psychopath-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/quazvr-ghost.rsi/meta.json | 4 +- .../Ghosts/raindrop-ghost.rsi/meta.json | 2 +- .../Ghosts/ravmorgan-ghost.rsi/meta.json | 4 +- .../Ghosts/reider207-ghost.rsi/meta.json | 2 +- .../Ghosts/rendzidead-ghost.rsi/meta.json | 4 +- .../_White/Ghosts/renosan-ghost.rsi/meta.json | 2 +- .../Ghosts/runamius-ghost.rsi/meta.json | 2 +- .../Ghosts/s_k_r_i_m_e_x-ghost.rsi/meta.json | 2 +- .../Ghosts/scituzer2-ghost.rsi/meta.json | 4 +- .../_White/Ghosts/serbo-ghost.rsi/meta.json | 2 +- .../Ghosts/shelupon-ghost.rsi/meta.json | 4 +- .../_White/Ghosts/ssao-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/suzuran.rsi/meta.json | 4 +- .../_White/Ghosts/valtos-ghost.rsi/meta.json | 2 + .../Ghosts/veryfish-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/vkuser_ghost.rsi/meta.json | 2 +- .../_White/Ghosts/waggier-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/warete-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/xivi-ghost.rsi/meta.json | 2 +- .../Ghosts/zilendorie-ghost.rsi/meta.json | 2 +- .../_White/Ghosts/zmes2-ghost.rsi/meta.json | 2 +- 52 files changed, 98 insertions(+), 102 deletions(-) diff --git a/Content.Client/_White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs b/Content.Client/_White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs index 3ff0568ad1..4f06537147 100644 --- a/Content.Client/_White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs +++ b/Content.Client/_White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs @@ -11,14 +11,15 @@ protected override void OnAppearanceChange(EntityUid uid, GhostComponent compone { base.OnAppearanceChange(uid, component, ref args); - if(args.Sprite == null) return; + if (args.Sprite == null) + return; if (AppearanceSystem.TryGetData(uid, CustomGhostAppearance.Sprite, out var rsiPath, args.Component)) { args.Sprite.LayerSetRSI(0, rsiPath); } - if(AppearanceSystem.TryGetData(uid, CustomGhostAppearance.AlphaOverride, out var alpha, args.Component)) + if (AppearanceSystem.TryGetData(uid, CustomGhostAppearance.AlphaOverride, out var alpha, args.Component)) { args.Sprite.Color = args.Sprite.Color.WithAlpha(alpha); } diff --git a/Content.Server/_White/CustomGhostSpriteSystem/CustomGhostSpriteSystem.cs b/Content.Server/_White/CustomGhostSpriteSystem/CustomGhostSpriteSystem.cs index bfe87d1bc8..51ba0a0119 100644 --- a/Content.Server/_White/CustomGhostSpriteSystem/CustomGhostSpriteSystem.cs +++ b/Content.Server/_White/CustomGhostSpriteSystem/CustomGhostSpriteSystem.cs @@ -14,15 +14,13 @@ public sealed class CustomGhostSpriteSystem : EntitySystem [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; - - public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnShit); + SubscribeLocalEvent(OnChangeAppearance); } - private void OnShit(EntityUid uid, GhostComponent component, PlayerAttachedEvent args) + private void OnChangeAppearance(EntityUid uid, GhostComponent component, PlayerAttachedEvent args) { if(!_playerManager.TryGetSessionByEntity(uid, out var session)) return; @@ -30,39 +28,33 @@ private void OnShit(EntityUid uid, GhostComponent component, PlayerAttachedEvent TrySetCustomSprite(uid, session.Name); } - public void TrySetCustomSprite(EntityUid ghostUid, string ckey) { var prototypes = _prototypeManager.EnumeratePrototypes(); foreach (var customGhostPrototype in prototypes) { - if (string.Equals(customGhostPrototype.Ckey, ckey, StringComparison.CurrentCultureIgnoreCase)) - { - _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.Sprite, customGhostPrototype.CustomSpritePath.ToString()); - _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.SizeOverride, customGhostPrototype.SizeOverride); - - if(customGhostPrototype.AlphaOverride > 0) - { - _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.AlphaOverride, customGhostPrototype.AlphaOverride); - } - - if (customGhostPrototype.GhostName != string.Empty) - { - _metaData.SetEntityName(ghostUid, customGhostPrototype.GhostName); - } - - if (customGhostPrototype.GhostDescription != string.Empty) - { - _metaData.SetEntityDescription(ghostUid, customGhostPrototype.GhostDescription); - } - + if (!string.Equals(customGhostPrototype.Ckey, ckey, StringComparison.CurrentCultureIgnoreCase)) + continue; + _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.Sprite, customGhostPrototype.CustomSpritePath.ToString()); + _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.SizeOverride, customGhostPrototype.SizeOverride); + if (customGhostPrototype.AlphaOverride > 0) + { + _appearanceSystem.SetData(ghostUid, CustomGhostAppearance.AlphaOverride, customGhostPrototype.AlphaOverride); + } + if (customGhostPrototype.GhostName != string.Empty) + { + _metaData.SetEntityName(ghostUid, customGhostPrototype.GhostName); + } - return; + if (customGhostPrototype.GhostDescription != string.Empty) + { + _metaData.SetEntityDescription(ghostUid, customGhostPrototype.GhostDescription); } + return; } } } diff --git a/Content.Shared/_White/CustomGhostSystem/CustomGhostPrototype.cs b/Content.Shared/_White/CustomGhostSystem/CustomGhostPrototype.cs index 454fce7ffe..20270113bf 100644 --- a/Content.Shared/_White/CustomGhostSystem/CustomGhostPrototype.cs +++ b/Content.Shared/_White/CustomGhostSystem/CustomGhostPrototype.cs @@ -6,16 +6,15 @@ namespace Content.Shared._White.CustomGhostSystem; /// -/// This is a prototype for... +/// Use this for custom ghost's /// [Prototype("customGhost")] public sealed class CustomGhostPrototype : IPrototype { - /// [IdDataField] public string ID { get; } = default!; - [DataField("ckey", required: true)] + [DataField(required: true)] public string Ckey { get; } = default!; [DataField("sprite", required: true)] diff --git a/Resources/Textures/_White/Ghosts/17shu-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/17shu-ghost.rsi/meta.json index 55850bb1c8..96414ba4c9 100644 --- a/Resources/Textures/_White/Ghosts/17shu-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/17shu-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "17shu", "size": { "x": 40, diff --git a/Resources/Textures/_White/Ghosts/4abere1-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/4abere1-ghost.rsi/meta.json index 13e0462dc3..2ecdb0070e 100644 --- a/Resources/Textures/_White/Ghosts/4abere1-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/4abere1-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/frosty-dev/white", + "license": "CC-BY-SA-4.0", + "copyright": "4abere1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_White/Ghosts/aeons_torn-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/aeons_torn-ghost.rsi/meta.json index b07ec9fa0f..2de4745f4c 100644 --- a/Resources/Textures/_White/Ghosts/aeons_torn-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/aeons_torn-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": null, - "copyright": null, + "license": "CC-BY-SA-4.0", + "copyright": "aeonsthorn", "size": { "x": 64, "y": 64 diff --git a/Resources/Textures/_White/Ghosts/afanasy-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/afanasy-ghost.rsi/meta.json index d34208ebc2..8717c5bf99 100644 --- a/Resources/Textures/_White/Ghosts/afanasy-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/afanasy-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation", + "license": "CC-BY-SA-4.0", + "copyright": "afanasy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_White/Ghosts/animeshka-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/animeshka-ghost.rsi/meta.json index 872ff88447..9c1290e6c3 100644 --- a/Resources/Textures/_White/Ghosts/animeshka-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/animeshka-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "mama", "size": { "x": 32, diff --git a/Resources/Textures/_White/Ghosts/cheese_cheese-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/cheese_cheese-ghost.rsi/meta.json index 7d43c116e1..ec29b2331f 100644 --- a/Resources/Textures/_White/Ghosts/cheese_cheese-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/cheese_cheese-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by MOYAMAMA", "size": { "x": 64, diff --git a/Resources/Textures/_White/Ghosts/dageff-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/dageff-ghost.rsi/meta.json index 3caaf8c2c4..807d3ff344 100644 --- a/Resources/Textures/_White/Ghosts/dageff-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/dageff-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Dageff", "size": { "x": 128, @@ -46,4 +46,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_White/Ghosts/deadisko-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/deadisko-ghost.rsi/meta.json index 2f65394499..387221c9ce 100644 --- a/Resources/Textures/_White/Ghosts/deadisko-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/deadisko-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/frosty-dev/white", + "license": "CC-BY-SA-4.0", + "copyright": "deadisko", "size": { "x": 64, "y": 64 diff --git a/Resources/Textures/_White/Ghosts/doommax-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/doommax-ghost.rsi/meta.json index ba5c8aabd3..45f3146baf 100644 --- a/Resources/Textures/_White/Ghosts/doommax-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/doommax-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by Pierre Chevreul", "size": { "x": 32, diff --git a/Resources/Textures/_White/Ghosts/felix-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/felix-ghost.rsi/meta.json index cdb95fad3b..fe4cccba6b 100644 --- a/Resources/Textures/_White/Ghosts/felix-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/felix-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "felix", "size": { "x": 64, diff --git a/Resources/Textures/_White/Ghosts/fjor-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/fjor-ghost.rsi/meta.json index 446d9e564e..c7cce830b2 100644 --- a/Resources/Textures/_White/Ghosts/fjor-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/fjor-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "", + "license": "CC-BY-SA-4.0", + "copyright": "fjor", "size": { "x": 128, "y": 128 diff --git a/Resources/Textures/_White/Ghosts/frostnova-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/frostnova-ghost.rsi/meta.json index 36d175a436..04cb23a82a 100644 --- a/Resources/Textures/_White/Ghosts/frostnova-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/frostnova-ghost.rsi/meta.json @@ -4,7 +4,7 @@ "x": 128, "y": 128 }, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Nair Sark", "states": [ { @@ -42,4 +42,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_White/Ghosts/hayras-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/hayras-ghost.rsi/meta.json index 13173585d3..f0af444f75 100644 --- a/Resources/Textures/_White/Ghosts/hayras-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/hayras-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation", + "license": "CC-BY-SA-4.0", + "copyright": "hayras", "size": { "x": 32, "y": 32 @@ -12,4 +12,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_White/Ghosts/hitpanda_ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/hitpanda_ghost.rsi/meta.json index 597c57c7e8..d772ada6ae 100644 --- a/Resources/Textures/_White/Ghosts/hitpanda_ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/hitpanda_ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/frosty-dev/white", + "license": "CC-BY-SA-4.0", + "copyright": "hitpanda", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_White/Ghosts/hskveez-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/hskveez-ghost.rsi/meta.json index f2273f93ce..7067bdb417 100644 --- a/Resources/Textures/_White/Ghosts/hskveez-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/hskveez-ghost.rsi/meta.json @@ -4,8 +4,8 @@ "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Poxuy", + "license": "CC-BY-SA-4.0", + "copyright": "hskveez", "states": [ { "name": "animated", diff --git a/Resources/Textures/_White/Ghosts/joulerk-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/joulerk-ghost.rsi/meta.json index 61ab18f70b..b645efb45c 100644 --- a/Resources/Textures/_White/Ghosts/joulerk-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/joulerk-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/frosty-dev/white", + "license": "CC-BY-SA-4.0", + "copyright": "joulerk", "size": { "x": 64, "y": 64 diff --git a/Resources/Textures/_White/Ghosts/kreses-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/kreses-ghost.rsi/meta.json index 92f87d0b1d..aa7e4dc580 100644 --- a/Resources/Textures/_White/Ghosts/kreses-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/kreses-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "White Dream", + "license": "CC-BY-SA-4.0", + "copyright": "kreses", "size": { "x": 64, "y": 64 diff --git a/Resources/Textures/_White/Ghosts/krokozyabra-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/krokozyabra-ghost.rsi/meta.json index 30971a0993..32dfab12ee 100644 --- a/Resources/Textures/_White/Ghosts/krokozyabra-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/krokozyabra-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Valtos", + "license": "CC-BY-SA-4.0", + "copyright": "krokozyabra", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_White/Ghosts/mapperian-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/mapperian-ghost.rsi/meta.json index 6f8a003277..7e9bda8ad4 100644 --- a/Resources/Textures/_White/Ghosts/mapperian-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/mapperian-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by cry_prism", "size": { "x": 128, diff --git a/Resources/Textures/_White/Ghosts/merkkaa-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/merkkaa-ghost.rsi/meta.json index acf9bd3d96..d64b3f3f9b 100644 --- a/Resources/Textures/_White/Ghosts/merkkaa-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/merkkaa-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by MOYAMAMA", "size": { "x": 32, diff --git a/Resources/Textures/_White/Ghosts/mikvisan-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/mikvisan-ghost.rsi/meta.json index 0c7731b810..eb65e53b23 100644 --- a/Resources/Textures/_White/Ghosts/mikvisan-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/mikvisan-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "mikvisan", "size": { "x": 64, diff --git a/Resources/Textures/_White/Ghosts/mr_regari.rsi/meta.json b/Resources/Textures/_White/Ghosts/mr_regari.rsi/meta.json index bb185a6cf0..cca6bd52c2 100644 --- a/Resources/Textures/_White/Ghosts/mr_regari.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/mr_regari.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation", + "license": "CC-BY-SA-4.0", + "copyright": "mr_regari", "size": { "x": 64, "y": 64 diff --git a/Resources/Textures/_White/Ghosts/nairsark-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/nairsark-ghost.rsi/meta.json index 6edddc1c9c..b1f9b48598 100644 --- a/Resources/Textures/_White/Ghosts/nairsark-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/nairsark-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by MOYAMAMA", "size": { "x": 48, diff --git a/Resources/Textures/_White/Ghosts/nexmachina-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/nexmachina-ghost.rsi/meta.json index 20b2de1d8b..4ec904a265 100644 --- a/Resources/Textures/_White/Ghosts/nexmachina-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/nexmachina-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "felix", "size": { "x": 64, diff --git a/Resources/Textures/_White/Ghosts/nosireapo-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/nosireapo-ghost.rsi/meta.json index 6ec789cd2a..892e674406 100644 --- a/Resources/Textures/_White/Ghosts/nosireapo-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/nosireapo-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Copyright https://github.com/frosty-dev/white", + "license": "CC-BY-SA-4.0", + "copyright": "nosireapo", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_White/Ghosts/omntns-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/omntns-ghost.rsi/meta.json index 2f65394499..5a210c0a7a 100644 --- a/Resources/Textures/_White/Ghosts/omntns-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/omntns-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/frosty-dev/white", + "license": "CC-BY-SA-4.0", + "copyright": "omntns", "size": { "x": 64, "y": 64 diff --git a/Resources/Textures/_White/Ghosts/persikvin-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/persikvin-ghost.rsi/meta.json index 5e84acdc1a..3b37d85d32 100644 --- a/Resources/Textures/_White/Ghosts/persikvin-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/persikvin-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Persikvin", "size": { "x": 64, @@ -11,4 +11,4 @@ "name": "animated" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_White/Ghosts/psychopath-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/psychopath-ghost.rsi/meta.json index d249f35991..ce551816eb 100644 --- a/Resources/Textures/_White/Ghosts/psychopath-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/psychopath-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by @baohe", "size": { "x": 32, diff --git a/Resources/Textures/_White/Ghosts/quazvr-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/quazvr-ghost.rsi/meta.json index a6c6b95e84..7b0dcb8dff 100644 --- a/Resources/Textures/_White/Ghosts/quazvr-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/quazvr-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Copyright https://github.com/frosty-dev/white", + "license": "CC-BY-SA-4.0", + "copyright": "quazvr", "size": { "x": 64, "y": 64 diff --git a/Resources/Textures/_White/Ghosts/raindrop-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/raindrop-ghost.rsi/meta.json index 6b5dfd8514..52c07e82be 100644 --- a/Resources/Textures/_White/Ghosts/raindrop-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/raindrop-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "@skyvesto", "size": { "x": 64, diff --git a/Resources/Textures/_White/Ghosts/ravmorgan-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/ravmorgan-ghost.rsi/meta.json index 5b73576d08..696ac78917 100644 --- a/Resources/Textures/_White/Ghosts/ravmorgan-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/ravmorgan-ghost.rsi/meta.json @@ -1,5 +1,7 @@ { "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "oleg", "size": { "x": 32, "y": 32 @@ -10,4 +12,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_White/Ghosts/reider207-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/reider207-ghost.rsi/meta.json index 86f69ea44f..fba14dcd95 100644 --- a/Resources/Textures/_White/Ghosts/reider207-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/reider207-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "reider207", "size": { "x": 128, diff --git a/Resources/Textures/_White/Ghosts/rendzidead-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/rendzidead-ghost.rsi/meta.json index a6c6b95e84..fed3bce8ef 100644 --- a/Resources/Textures/_White/Ghosts/rendzidead-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/rendzidead-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Copyright https://github.com/frosty-dev/white", + "license": "CC-BY-SA-4.0", + "copyright": "rendzidead", "size": { "x": 64, "y": 64 diff --git a/Resources/Textures/_White/Ghosts/renosan-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/renosan-ghost.rsi/meta.json index 7809eece42..06223e6da2 100644 --- a/Resources/Textures/_White/Ghosts/renosan-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/renosan-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by Renosan", "size": { "x": 64, diff --git a/Resources/Textures/_White/Ghosts/runamius-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/runamius-ghost.rsi/meta.json index 12d001b1d6..5ba5c25682 100644 --- a/Resources/Textures/_White/Ghosts/runamius-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/runamius-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "P O X U I", "size": { "x": 32, diff --git a/Resources/Textures/_White/Ghosts/s_k_r_i_m_e_x-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/s_k_r_i_m_e_x-ghost.rsi/meta.json index 3d9c1e7a71..e65d840c4d 100644 --- a/Resources/Textures/_White/Ghosts/s_k_r_i_m_e_x-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/s_k_r_i_m_e_x-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by s_k_r_i_m_e_x", "size": { "x": 64, diff --git a/Resources/Textures/_White/Ghosts/scituzer2-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/scituzer2-ghost.rsi/meta.json index 9dd05b98b0..1947fb4863 100644 --- a/Resources/Textures/_White/Ghosts/scituzer2-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/scituzer2-ghost.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": null, - "copyright": null, + "license": "CC-BY-SA-4.0", + "copyright": "oniks", "size": { "x": 64, "y": 64 diff --git a/Resources/Textures/_White/Ghosts/serbo-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/serbo-ghost.rsi/meta.json index 49774a85da..211a580ebe 100644 --- a/Resources/Textures/_White/Ghosts/serbo-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/serbo-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "mama", "size": { "x": 128, diff --git a/Resources/Textures/_White/Ghosts/shelupon-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/shelupon-ghost.rsi/meta.json index 020e11932f..d2624a0acd 100644 --- a/Resources/Textures/_White/Ghosts/shelupon-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/shelupon-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "poebat", "size": { "x": 32, @@ -12,4 +12,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_White/Ghosts/ssao-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/ssao-ghost.rsi/meta.json index 0eb08fcd96..6170f9a849 100644 --- a/Resources/Textures/_White/Ghosts/ssao-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/ssao-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by MAMA OLEGA", "size": { "x": 128, diff --git a/Resources/Textures/_White/Ghosts/suzuran.rsi/meta.json b/Resources/Textures/_White/Ghosts/suzuran.rsi/meta.json index 1758e7745c..309ec34251 100644 --- a/Resources/Textures/_White/Ghosts/suzuran.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/suzuran.rsi/meta.json @@ -1,6 +1,6 @@ { - "license": "CC-BY-SA-3.0", - "copyright": "poebat", + "license": "CC-BY-SA-4.0", + "copyright": "Created by cry_prism", "version": 1, "size": { "x": 64, diff --git a/Resources/Textures/_White/Ghosts/valtos-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/valtos-ghost.rsi/meta.json index a5953afd3b..28b31e4ea2 100644 --- a/Resources/Textures/_White/Ghosts/valtos-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/valtos-ghost.rsi/meta.json @@ -1,4 +1,6 @@ { + "license": "CC-BY-SA-4.0", + "copyright": "Texas", "version": 1, "size": { "x": 128, diff --git a/Resources/Textures/_White/Ghosts/veryfish-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/veryfish-ghost.rsi/meta.json index f131412b71..470391e7aa 100644 --- a/Resources/Textures/_White/Ghosts/veryfish-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/veryfish-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "@skyvesto", "size": { "x": 150, diff --git a/Resources/Textures/_White/Ghosts/vkuser_ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/vkuser_ghost.rsi/meta.json index 770afb6f1e..259070ba47 100644 --- a/Resources/Textures/_White/Ghosts/vkuser_ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/vkuser_ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by @zakvasska", "size": { "x": 64, diff --git a/Resources/Textures/_White/Ghosts/waggier-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/waggier-ghost.rsi/meta.json index f804dae5b1..5fcd4f827e 100644 --- a/Resources/Textures/_White/Ghosts/waggier-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/waggier-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by dosharus", "size": { "x": 128, diff --git a/Resources/Textures/_White/Ghosts/warete-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/warete-ghost.rsi/meta.json index 67e8f4b3eb..3a6467b446 100644 --- a/Resources/Textures/_White/Ghosts/warete-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/warete-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Warete", "size": { "x": 128, diff --git a/Resources/Textures/_White/Ghosts/xivi-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/xivi-ghost.rsi/meta.json index 941830ea3f..9fe84b2b25 100644 --- a/Resources/Textures/_White/Ghosts/xivi-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/xivi-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by @xivi", "size": { "x": 128, diff --git a/Resources/Textures/_White/Ghosts/zilendorie-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/zilendorie-ghost.rsi/meta.json index 5cf8746f8d..a2f443231f 100644 --- a/Resources/Textures/_White/Ghosts/zilendorie-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/zilendorie-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by @mole1258", "size": { "x": 128, diff --git a/Resources/Textures/_White/Ghosts/zmes2-ghost.rsi/meta.json b/Resources/Textures/_White/Ghosts/zmes2-ghost.rsi/meta.json index 2ae724c46a..3da48b01d1 100644 --- a/Resources/Textures/_White/Ghosts/zmes2-ghost.rsi/meta.json +++ b/Resources/Textures/_White/Ghosts/zmes2-ghost.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-SA-4.0", "copyright": "Created by milkteaparpe", "size": { "x": 60,