From 9a7a45a2c5d629ac3bb48e8f6e42ef67637f0bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=86=D0=B2=D0=B0=D0=BD=20=D0=9E=D0=BD=D1=96=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Sun, 29 Dec 2024 20:54:00 +0300 Subject: [PATCH 01/11] - added description for asperts that need it --- Content.Server/_White/UnsafePseudoIoC.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Server/_White/UnsafePseudoIoC.cs b/Content.Server/_White/UnsafePseudoIoC.cs index f0a423f0e4..2c55b065cc 100644 --- a/Content.Server/_White/UnsafePseudoIoC.cs +++ b/Content.Server/_White/UnsafePseudoIoC.cs @@ -9,6 +9,7 @@ public static class UnsafePseudoIoC // Я НАНАВИЖУ IOCMAANGERRESOLVEPOSH public static void Initialize() { ConfigurationManager = IoCManager.Resolve(); + ChatHelper.Initialize(IoCManager.Resolve(), IoCManager.Resolve());// heh IOCMAANGERRESOLVEPOSHEL NAHUI } } From fbae9f1027091a1a77e20e0756a2556df8cdcaaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=86=D0=B2=D0=B0=D0=BD=20=D0=9E=D0=BD=D1=96=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Sun, 29 Dec 2024 20:54:34 +0300 Subject: [PATCH 02/11] huh? --- .../AspectsSystem/Aspects/BattledAspect.cs | 2 ++ .../AspectsSystem/Aspects/CatEarsAspect.cs | 2 ++ .../AspectsSystem/Aspects/DancingAspect.cs | 2 ++ .../AspectsSystem/Aspects/DrunkAspect.cs | 5 +++ .../Aspects/FastAndFuriousAspect.cs | 2 ++ .../AspectsSystem/Aspects/ImmersiveAspect.cs | 10 ++---- .../Aspects/RandomAccentAspect.cs | 4 +-- .../Aspects/RandomAppearanceAspect.cs | 2 ++ .../AspectsSystem/Aspects/RandomItemAspect.cs | 2 ++ .../AspectsSystem/Aspects/SkeletonAspect.cs | 4 +++ .../_White/AspectsSystem/Base/ChatHelper.cs | 33 +++++++++++++++++++ Content.Server/_White/UnsafePseudoIoC.cs | 7 ++-- Resources/Locale/ru-RU/_white/aspects.ftl | 9 +++++ 13 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 Content.Server/_White/AspectsSystem/Base/ChatHelper.cs diff --git a/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs index 96cf45fbcc..8b0d181cb0 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs @@ -43,6 +43,7 @@ public sealed class BattledAspect : AspectSystem while (query.MoveNext(out var ent, out _)) { GiveItem(ent); + ChatHelper.SendAspectDescription(ent, Loc.GetString("battled-aspect-desc")); } } @@ -61,6 +62,7 @@ public sealed class BattledAspect : AspectSystem var mob = ev.Mob; GiveItem(mob); + ChatHelper.SendAspectDescription(mob, Loc.GetString("battled-aspect-desc")); } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs index d75e9de395..f6ad27f73c 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs @@ -66,6 +66,7 @@ public sealed class CatEarsAspect : AspectSystem while (query.MoveNext(out var ent, out var appearance)) { AddMarkings(ent, appearance); + ChatHelper.SendAspectDescription(ent, Loc.GetString("cat-ears-aspect-desc")); } } @@ -81,6 +82,7 @@ public sealed class CatEarsAspect : AspectSystem return; AddMarkings(ev.Mob); + ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("cat-ears-aspect-desc")); } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs index f04cf6e4e0..7d2ad4e7ac 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs @@ -28,6 +28,7 @@ public sealed class DancingAspect : AspectSystem while (query.MoveNext(out var ent, out _, out _)) { EnsureComp(ent); + ChatHelper.SendAspectDescription(ent, Loc.GetString("dancing-aspect-desc")); } } @@ -45,6 +46,7 @@ public sealed class DancingAspect : AspectSystem var mob = ev.Mob; EnsureComp(mob); + ChatHelper.SendAspectDescription(mob, Loc.GetString("dancing-aspect-desc")); } } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs index 30be9f7931..d5d7c551a6 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs @@ -27,6 +27,8 @@ public sealed class DrunkAspect : AspectSystem while (query.MoveNext(out var ent, out _)) { _drunkSystem.TryApplyDrunkenness(ent, 50); + + ChatHelper.SendAspectDescription(ent, Loc.GetString("drunk-aspect-desc")); } } @@ -44,6 +46,9 @@ public sealed class DrunkAspect : AspectSystem var mob = ev.Mob; _drunkSystem.TryApplyDrunkenness(mob, 50); + + ChatHelper.SendAspectDescription(mob, Loc.GetString("drunk-aspect-desc")); + } } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs index 9221bd23a1..979ec0463c 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs @@ -39,6 +39,7 @@ public sealed class FastAndFuriousAspect : AspectSystem(ent); + ChatHelper.SendAspectDescription(ent, Loc.GetString("fast-and-furious-aspect-desc")); } } @@ -53,6 +54,7 @@ public sealed class FastAndFuriousAspect : AspectSystem FuckUpEye(entity, 0.6f); AddTelescope(entity); - _playerManager.TryGetSessionByEntity(entity, out var session); - if (session != null) - _chatManager.DispatchServerMessage(session, Loc.GetString("immersive-aspect-desc")); + ChatHelper.SendAspectDescription(entity, Loc.GetString("immersive-aspect-desc")); } } @@ -83,9 +81,7 @@ public sealed class ImmersiveAspect : AspectSystem FuckUpEye(ev.Mob, 0.6f); AddTelescope(ev.Mob); - _playerManager.TryGetSessionByEntity(ev.Mob, out var session); - if (session != null) - _chatManager.DispatchServerMessage(session, Loc.GetString("immersive-aspect-desc")); + ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("immersive-aspect-desc")); } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs index b443380f4a..5013dafe83 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs @@ -28,6 +28,7 @@ public sealed class RandomAccentAspect : AspectSystem(ent); + ChatHelper.SendAspectDescription(ent, Loc.GetString("random-appearance-aspect-desc")); } } @@ -41,6 +42,7 @@ public sealed class RandomAppearanceAspect : AspectSystem(mob); + ChatHelper.SendAspectDescription(mob, Loc.GetString("random-appearance-aspect-desc")); } } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs index 2519e2f43d..118c2c68d9 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs @@ -30,6 +30,7 @@ public sealed class RandomItemAspect : AspectSystem while (query.MoveNext(out var ent, out _)) { GiveItem(ent, component); + ChatHelper.SendAspectDescription(ent, Loc.GetString("random-item-aspect-desc")); } } @@ -48,6 +49,7 @@ public sealed class RandomItemAspect : AspectSystem var mob = ev.Mob; GiveItem(mob, component); + ChatHelper.SendAspectDescription(mob, Loc.GetString("random-item-aspect-desc")); } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs index 4eb958e997..2b6e0117e0 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs @@ -42,7 +42,9 @@ public sealed class SkeletonAspect : AspectSystem foreach (var ent in entitiesToPolymorph) { PolymorphEntity(ent.Key, ent.Value); + ChatHelper.SendAspectDescription(ent.Key, Loc.GetString("skeleton-aspect-desc")); } + } private void HandleLateJoin(PlayerSpawnCompleteEvent ev) @@ -57,6 +59,8 @@ public sealed class SkeletonAspect : AspectSystem return; PolymorphEntity(ev.Mob); + + ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("skeleton-aspect-desc")); } } diff --git a/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs b/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs new file mode 100644 index 0000000000..f736f46ed1 --- /dev/null +++ b/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Content.Server.Chat.Managers; +using Robust.Shared.Player; + +namespace Content.Server._White.AspectsSystem.Base +{ + public static class ChatHelper + { + [Dependency] private static ISharedPlayerManager _playerManager = default!; + [Dependency] private static IChatManager _chatManager = default!; + + + + + public static void Initialize(ISharedPlayerManager playerManager, IChatManager chatManager) + { + _playerManager = playerManager; + _chatManager = chatManager; + } + public static void SendAspectDescription(EntityUid mob, string messageKey) + { + _playerManager.TryGetSessionByEntity(mob, out var session); + if (session != null) + { + _chatManager.DispatchServerMessage(session, Loc.GetString(messageKey)); + } + } + } +} diff --git a/Content.Server/_White/UnsafePseudoIoC.cs b/Content.Server/_White/UnsafePseudoIoC.cs index 2c55b065cc..88ff739246 100644 --- a/Content.Server/_White/UnsafePseudoIoC.cs +++ b/Content.Server/_White/UnsafePseudoIoC.cs @@ -1,4 +1,7 @@ -using Robust.Shared.Configuration; +using Content.Server._White.AspectsSystem.Base; +using Content.Server.Chat.Managers; +using Robust.Shared.Configuration; +using Robust.Shared.Player; namespace Content.Server._White; @@ -9,7 +12,7 @@ public static class UnsafePseudoIoC // Я НАНАВИЖУ IOCMAANGERRESOLVEPOSH public static void Initialize() { ConfigurationManager = IoCManager.Resolve(); - ChatHelper.Initialize(IoCManager.Resolve(), IoCManager.Resolve());// heh IOCMAANGERRESOLVEPOSHEL NAHUI + ChatHelper.Initialize(IoCManager.Resolve(), IoCManager.Resolve());// heh IOCMAANGERRESOLVEPOSHEL NAHUI X2 } } diff --git a/Resources/Locale/ru-RU/_white/aspects.ftl b/Resources/Locale/ru-RU/_white/aspects.ftl index 0b898194f6..7a9dab2c84 100644 --- a/Resources/Locale/ru-RU/_white/aspects.ftl +++ b/Resources/Locale/ru-RU/_white/aspects.ftl @@ -1 +1,10 @@ immersive-aspect-desc = Для осмотра своего окружение, нажмите клавишу присмотреться/прицелиться (по умолчанию - Пробел). +skeleton-aspect-desc = temp1. +battled-aspect-desc = temp2. +cat-ears-aspect-desc = temp3. +dancing-aspect-desc = temp4. +drunk-aspect-desc = temp5. +fast-and-furious-aspect-desc = temp6. +random-accent-aspect-desc = temp7. +random-appearance-aspect-desc = temp8. +random-item-aspect-desc = temp9. \ No newline at end of file From b62f465c4135b4c610d331dea15d4d1caa8b8fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=86=D0=B2=D0=B0=D0=BD=20=D0=9E=D0=BD=D1=96=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Sun, 29 Dec 2024 20:59:01 +0300 Subject: [PATCH 03/11] ups --- .../_White/AspectsSystem/Aspects/RandomAccentAspect.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs index 5013dafe83..28e251952e 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs @@ -44,6 +44,7 @@ public sealed class RandomAccentAspect : AspectSystem Date: Sun, 5 Jan 2025 05:34:44 +0300 Subject: [PATCH 04/11] descriptions --- Resources/Locale/ru-RU/_white/aspects.ftl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/ru-RU/_white/aspects.ftl b/Resources/Locale/ru-RU/_white/aspects.ftl index 7a9dab2c84..a9ae84c11e 100644 --- a/Resources/Locale/ru-RU/_white/aspects.ftl +++ b/Resources/Locale/ru-RU/_white/aspects.ftl @@ -1,10 +1,10 @@ immersive-aspect-desc = Для осмотра своего окружение, нажмите клавишу присмотреться/прицелиться (по умолчанию - Пробел). -skeleton-aspect-desc = temp1. -battled-aspect-desc = temp2. -cat-ears-aspect-desc = temp3. -dancing-aspect-desc = temp4. -drunk-aspect-desc = temp5. -fast-and-furious-aspect-desc = temp6. -random-accent-aspect-desc = temp7. -random-appearance-aspect-desc = temp8. -random-item-aspect-desc = temp9. \ No newline at end of file +skeleton-aspect-desc = Все персонажи стали скелетами. +battled-aspect-desc = Всем игрокам выдано случайное оружие. +cat-ears-aspect-desc = Котячьи ушки! Уиииии!. +dancing-aspect-desc = Все персонажи находятся в танце. +drunk-aspect-desc = Все персонажи пьяны. +fast-and-furious-aspect-desc = Все персонажи ускоряются. +random-accent-aspect-desc = Все персонажи получили случайный акцент. +random-appearance-aspect-desc = Все персонажи получили случайную внешность. +random-item-aspect-desc = Все персонажи получили случайный предмет. \ No newline at end of file From ce9b8af5605cb2d71585d3c61754a3f02724bbc9 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 5 Jan 2025 18:37:53 +0300 Subject: [PATCH 05/11] =?UTF-8?q?=D0=A3=D0=B2=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AspectsSystem/Aspects/BattledAspect.cs | 10 +++--- .../AspectsSystem/Aspects/CatEarsAspect.cs | 24 ++++++------- .../AspectsSystem/Aspects/DancingAspect.cs | 5 +-- .../AspectsSystem/Aspects/DrunkAspect.cs | 6 ++-- .../Aspects/FastAndFuriousAspect.cs | 4 +-- .../AspectsSystem/Aspects/ImmersiveAspect.cs | 11 ++---- .../Aspects/RandomAccentAspect.cs | 4 +-- .../Aspects/RandomAppearanceAspect.cs | 6 ++-- .../AspectsSystem/Aspects/RandomItemAspect.cs | 8 ++--- .../AspectsSystem/Aspects/SkeletonAspect.cs | 6 ++-- .../_White/AspectsSystem/Base/ChatHelper.cs | 34 ++++++------------- Content.Server/_White/UnsafePseudoIoC.cs | 1 - Resources/Locale/ru-RU/_white/aspects.ftl | 16 ++++----- 13 files changed, 57 insertions(+), 78 deletions(-) diff --git a/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs index 8b0d181cb0..5ceb47b97a 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/BattledAspect.cs @@ -18,6 +18,7 @@ public sealed class BattledAspect : AspectSystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; private NonPeacefulRoundItemsPrototype _nonPeacefulRoundItemsPrototype = default!; @@ -32,7 +33,7 @@ public sealed class BattledAspect : AspectSystem { base.Started(uid, component, gameRule, args); - var prototypes = _prototypeManager.EnumeratePrototypes().ToList(); + var prototypes = _prototypeManager.EnumeratePrototypes().ToList(); if (prototypes.Count == 0) ForceEndSelf(uid, gameRule); @@ -43,7 +44,6 @@ public sealed class BattledAspect : AspectSystem while (query.MoveNext(out var ent, out _)) { GiveItem(ent); - ChatHelper.SendAspectDescription(ent, Loc.GetString("battled-aspect-desc")); } } @@ -62,7 +62,7 @@ public sealed class BattledAspect : AspectSystem var mob = ev.Mob; GiveItem(mob); - ChatHelper.SendAspectDescription(mob, Loc.GetString("battled-aspect-desc")); + _chatHelper.SendAspectDescription(mob, Loc.GetString("battled-aspect-desc")); } } @@ -74,10 +74,10 @@ public sealed class BattledAspect : AspectSystem var transform = CompOrNull(player); - if(transform == null) + if (transform == null) return; - if(!HasComp(player)) + if (!HasComp(player)) return; var weaponEntity = EntityManager.SpawnEntity(item, transform.Coordinates); diff --git a/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs index f6ad27f73c..9f366d1b47 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/CatEarsAspect.cs @@ -21,6 +21,7 @@ public sealed class CatEarsAspect : AspectSystem [Dependency] private readonly IPrototypeManager _protoMan = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; private MarkingPrototype _ears = default!; private MarkingPrototype _tail = default!; @@ -66,7 +67,6 @@ public sealed class CatEarsAspect : AspectSystem while (query.MoveNext(out var ent, out var appearance)) { AddMarkings(ent, appearance); - ChatHelper.SendAspectDescription(ent, Loc.GetString("cat-ears-aspect-desc")); } } @@ -82,7 +82,7 @@ public sealed class CatEarsAspect : AspectSystem return; AddMarkings(ev.Mob); - ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("cat-ears-aspect-desc")); + _chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("cat-ears-aspect-desc")); } } @@ -96,18 +96,18 @@ public sealed class CatEarsAspect : AspectSystem case "Felinid": return; case "Human": - { - if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.HeadTop, out var markings) || - markings.Count == 0) - AddEars(appearance); + { + if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.HeadTop, out var markings) || + markings.Count == 0) + AddEars(appearance); - if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.Tail, out markings) || markings.Count == 0) - AddTail(appearance); + if (!appearance.MarkingSet.TryGetCategory(MarkingCategories.Tail, out markings) || markings.Count == 0) + AddTail(appearance); - Dirty(uid, appearance); - ChangeEmotesVoice(uid, appearance); - return; - } + Dirty(uid, appearance); + ChangeEmotesVoice(uid, appearance); + return; + } default: AddEars(appearance); AddTail(appearance); diff --git a/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs index 7d2ad4e7ac..010bff9145 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/DancingAspect.cs @@ -11,6 +11,8 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class DancingAspect : AspectSystem { + [Dependency] private readonly ChatHelper _chatHelper = default!; + public override void Initialize() { base.Initialize(); @@ -28,7 +30,6 @@ public sealed class DancingAspect : AspectSystem while (query.MoveNext(out var ent, out _, out _)) { EnsureComp(ent); - ChatHelper.SendAspectDescription(ent, Loc.GetString("dancing-aspect-desc")); } } @@ -46,7 +47,7 @@ public sealed class DancingAspect : AspectSystem var mob = ev.Mob; EnsureComp(mob); - ChatHelper.SendAspectDescription(mob, Loc.GetString("dancing-aspect-desc")); + _chatHelper.SendAspectDescription(mob, Loc.GetString("dancing-aspect-desc")); } } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs index d5d7c551a6..3f684eac74 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/DrunkAspect.cs @@ -11,6 +11,7 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class DrunkAspect : AspectSystem { [Dependency] private readonly SharedDrunkSystem _drunkSystem = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { @@ -27,8 +28,6 @@ public sealed class DrunkAspect : AspectSystem while (query.MoveNext(out var ent, out _)) { _drunkSystem.TryApplyDrunkenness(ent, 50); - - ChatHelper.SendAspectDescription(ent, Loc.GetString("drunk-aspect-desc")); } } @@ -47,8 +46,7 @@ public sealed class DrunkAspect : AspectSystem _drunkSystem.TryApplyDrunkenness(mob, 50); - ChatHelper.SendAspectDescription(mob, Loc.GetString("drunk-aspect-desc")); - + _chatHelper.SendAspectDescription(mob, Loc.GetString("drunk-aspect-desc")); } } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs index 979ec0463c..57f98479bf 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs @@ -13,6 +13,7 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class FastAndFuriousAspect : AspectSystem { + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { base.Initialize(); @@ -39,7 +40,6 @@ public sealed class FastAndFuriousAspect : AspectSystem(ent); - ChatHelper.SendAspectDescription(ent, Loc.GetString("fast-and-furious-aspect-desc")); } } @@ -54,7 +54,7 @@ public sealed class FastAndFuriousAspect : AspectSystem { - [Dependency] private readonly SharedContentEyeSystem _eye = default!; [Dependency] private readonly SharedTelescopeSystem _telescope = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { @@ -48,7 +43,7 @@ public sealed class ImmersiveAspect : AspectSystem FuckUpEye(entity, 0.6f); AddTelescope(entity); - ChatHelper.SendAspectDescription(entity, Loc.GetString("immersive-aspect-desc")); + _chatHelper.SendAspectDescription(entity, Loc.GetString("immersive-aspect-desc")); } } @@ -81,7 +76,7 @@ public sealed class ImmersiveAspect : AspectSystem FuckUpEye(ev.Mob, 0.6f); AddTelescope(ev.Mob); - ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("immersive-aspect-desc")); + _chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("immersive-aspect-desc")); } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs index 28e251952e..ab09d3aa27 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/RandomAccentAspect.cs @@ -13,6 +13,7 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class RandomAccentAspect : AspectSystem { [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { @@ -28,7 +29,6 @@ public sealed class RandomAccentAspect : AspectSystem { + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(HandleLateJoin, after: new [] {typeof(StationRecordsSystem)}); + SubscribeLocalEvent(HandleLateJoin, after: new[] { typeof(StationRecordsSystem) }); } protected override void Started(EntityUid uid, RandomAppearanceAspectComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) @@ -24,7 +25,6 @@ public sealed class RandomAppearanceAspect : AspectSystem(ent); - ChatHelper.SendAspectDescription(ent, Loc.GetString("random-appearance-aspect-desc")); } } @@ -42,7 +42,7 @@ public sealed class RandomAppearanceAspect : AspectSystem(mob); - ChatHelper.SendAspectDescription(mob, Loc.GetString("random-appearance-aspect-desc")); + _chatHelper.SendAspectDescription(mob, Loc.GetString("random-appearance-aspect-desc")); } } } diff --git a/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs index 118c2c68d9..92034df319 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/RandomItemAspect.cs @@ -14,6 +14,7 @@ public sealed class RandomItemAspect : AspectSystem { [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly RandomGiftSystem _giftSystem = default!; + [Dependency] private readonly ChatHelper _chatHelper = default!; public override void Initialize() { @@ -30,7 +31,6 @@ public sealed class RandomItemAspect : AspectSystem while (query.MoveNext(out var ent, out _)) { GiveItem(ent, component); - ChatHelper.SendAspectDescription(ent, Loc.GetString("random-item-aspect-desc")); } } @@ -49,7 +49,7 @@ public sealed class RandomItemAspect : AspectSystem var mob = ev.Mob; GiveItem(mob, component); - ChatHelper.SendAspectDescription(mob, Loc.GetString("random-item-aspect-desc")); + _chatHelper.SendAspectDescription(mob, Loc.GetString("random-item-aspect-desc")); } } @@ -64,10 +64,10 @@ public sealed class RandomItemAspect : AspectSystem var transform = CompOrNull(player); - if(transform == null) + if (transform == null) return; - if(!HasComp(player)) + if (!HasComp(player)) return; var weaponEntity = EntityManager.SpawnEntity(component.Item, transform.Coordinates); diff --git a/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs index 2b6e0117e0..3abea428ef 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/SkeletonAspect.cs @@ -13,6 +13,7 @@ namespace Content.Server._White.AspectsSystem.Aspects; public sealed class SkeletonAspect : AspectSystem { + [Dependency] private readonly ChatHelper _chatHelper = default!; // [Dependency] private readonly IPrototypeManager _protoMan = default!; // [Dependency] private readonly PolymorphSystem _polymorph = default!; // [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!; @@ -42,9 +43,8 @@ public sealed class SkeletonAspect : AspectSystem foreach (var ent in entitiesToPolymorph) { PolymorphEntity(ent.Key, ent.Value); - ChatHelper.SendAspectDescription(ent.Key, Loc.GetString("skeleton-aspect-desc")); } - + } private void HandleLateJoin(PlayerSpawnCompleteEvent ev) @@ -60,7 +60,7 @@ public sealed class SkeletonAspect : AspectSystem PolymorphEntity(ev.Mob); - ChatHelper.SendAspectDescription(ev.Mob, Loc.GetString("skeleton-aspect-desc")); + _chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("skeleton-aspect-desc")); } } diff --git a/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs b/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs index f736f46ed1..045ff1fff1 100644 --- a/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs +++ b/Content.Server/_White/AspectsSystem/Base/ChatHelper.cs @@ -1,33 +1,19 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Content.Server.Chat.Managers; using Robust.Shared.Player; -namespace Content.Server._White.AspectsSystem.Base +namespace Content.Server._White.AspectsSystem.Base; + +public sealed class ChatHelper : EntitySystem { - public static class ChatHelper + [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private readonly IChatManager _chatManager = default!; + + public void SendAspectDescription(EntityUid mob, string messageKey) { - [Dependency] private static ISharedPlayerManager _playerManager = default!; - [Dependency] private static IChatManager _chatManager = default!; - - - - - public static void Initialize(ISharedPlayerManager playerManager, IChatManager chatManager) + _playerManager.TryGetSessionByEntity(mob, out var session); + if (session != null) { - _playerManager = playerManager; - _chatManager = chatManager; - } - public static void SendAspectDescription(EntityUid mob, string messageKey) - { - _playerManager.TryGetSessionByEntity(mob, out var session); - if (session != null) - { - _chatManager.DispatchServerMessage(session, Loc.GetString(messageKey)); - } + _chatManager.DispatchServerMessage(session, Loc.GetString(messageKey)); } } } diff --git a/Content.Server/_White/UnsafePseudoIoC.cs b/Content.Server/_White/UnsafePseudoIoC.cs index 88ff739246..e22414eb4a 100644 --- a/Content.Server/_White/UnsafePseudoIoC.cs +++ b/Content.Server/_White/UnsafePseudoIoC.cs @@ -12,7 +12,6 @@ public static class UnsafePseudoIoC // Я НАНАВИЖУ IOCMAANGERRESOLVEPOSH public static void Initialize() { ConfigurationManager = IoCManager.Resolve(); - ChatHelper.Initialize(IoCManager.Resolve(), IoCManager.Resolve());// heh IOCMAANGERRESOLVEPOSHEL NAHUI X2 } } diff --git a/Resources/Locale/ru-RU/_white/aspects.ftl b/Resources/Locale/ru-RU/_white/aspects.ftl index a9ae84c11e..22c9f07c79 100644 --- a/Resources/Locale/ru-RU/_white/aspects.ftl +++ b/Resources/Locale/ru-RU/_white/aspects.ftl @@ -1,10 +1,10 @@ immersive-aspect-desc = Для осмотра своего окружение, нажмите клавишу присмотреться/прицелиться (по умолчанию - Пробел). -skeleton-aspect-desc = Все персонажи стали скелетами. -battled-aspect-desc = Всем игрокам выдано случайное оружие. -cat-ears-aspect-desc = Котячьи ушки! Уиииии!. -dancing-aspect-desc = Все персонажи находятся в танце. -drunk-aspect-desc = Все персонажи пьяны. -fast-and-furious-aspect-desc = Все персонажи ускоряются. -random-accent-aspect-desc = Все персонажи получили случайный акцент. +skeleton-aspect-desc = Из-за обстоятельств на станции - все персонажи стали скелетами. +battled-aspect-desc = Чтобы то ни было ранее, но у вас с собой оказалось случайное оружие. +cat-ears-aspect-desc = Из-за ошибки в системе клонирования на ЦК все члены экипажа стали походить на фелинидов. +dancing-aspect-desc = Федерация Волшебников прокляла всех работников этой станции на танец до смерти. +drunk-aspect-desc = Ваш персонаж слишком хорошо отгулял в своё свободное время. +fast-and-furious-aspect-desc = Из-за обстоятельств на станции - все персонажи передвигаются быстрее обычного. +random-accent-aspect-desc = Из-за обстоятельств на станции - все персонажи получили случайный акцент. random-appearance-aspect-desc = Все персонажи получили случайную внешность. -random-item-aspect-desc = Все персонажи получили случайный предмет. \ No newline at end of file +random-item-aspect-desc = НаноТрейзен выдало всем случайный предмет. From e0987b782c942b9fca8304c02509c9c1e1c35455 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 5 Jan 2025 19:12:26 +0300 Subject: [PATCH 06/11] =?UTF-8?q?=D0=A3=D1=85=20=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Aspects/FastAndFuriousAspect.cs | 15 ++++-- .../AspectsSystem/Base/AspectComponent.cs | 2 + .../_White/AspectsSystem/Base/AspectSystem.cs | 17 ++++--- .../Prototypes/_White/Aspects/Aspects.yml | 46 +++++++++++-------- 4 files changed, 52 insertions(+), 28 deletions(-) diff --git a/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs b/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs index 57f98479bf..6b2d02d10b 100644 --- a/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs +++ b/Content.Server/_White/AspectsSystem/Aspects/FastAndFuriousAspect.cs @@ -50,11 +50,18 @@ public sealed class FastAndFuriousAspect : AspectSystem(); + while (query.MoveNext(out var ruleEntity, out _, out var gameRule)) + { + if (!GameTicker.IsGameRuleAdded(ruleEntity, gameRule)) + continue; - ModifySpeedIfActive(ev.Mob); - _chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("fast-and-furious-aspect-desc")); + if (!ev.LateJoin) + return; + + ModifySpeedIfActive(ev.Mob); + _chatHelper.SendAspectDescription(ev.Mob, Loc.GetString("fast-and-furious-aspect-desc")); + } } private void ModifySpeedIfActive(EntityUid mob) diff --git a/Content.Server/_White/AspectsSystem/Base/AspectComponent.cs b/Content.Server/_White/AspectsSystem/Base/AspectComponent.cs index 0caf162d08..a26bf964d3 100644 --- a/Content.Server/_White/AspectsSystem/Base/AspectComponent.cs +++ b/Content.Server/_White/AspectsSystem/Base/AspectComponent.cs @@ -12,6 +12,8 @@ public sealed partial class AspectComponent : Component [DataField] public string? Requires; + [DataField] public string? Sender; + [DataField] public float Weight = 1.0f; [DataField] public bool IsForbidden; diff --git a/Content.Server/_White/AspectsSystem/Base/AspectSystem.cs b/Content.Server/_White/AspectsSystem/Base/AspectSystem.cs index af51b40acd..b644e4ca62 100644 --- a/Content.Server/_White/AspectsSystem/Base/AspectSystem.cs +++ b/Content.Server/_White/AspectsSystem/Base/AspectSystem.cs @@ -66,8 +66,10 @@ public abstract class AspectSystem : GameRuleSystem where T : Component if (aspect is { Description: not null, IsHidden: false }) { - _chatSystem.DispatchGlobalAnnouncement(aspect.Description, playSound: false, - colorOverride: Color.Aquamarine); + _chatSystem.DispatchGlobalAnnouncement(aspect.Description, + sender: aspect.Sender ??= "Центральное Командование", + playSound: false, + colorOverride: Color.Aquamarine); } _audio.PlayGlobal(aspect.StartAudio, Filter.Broadcast(), true); @@ -105,14 +107,17 @@ public abstract class AspectSystem : GameRuleSystem where T : Component if (aspect is { Name: not null, IsHidden: false }) { - _chatSystem.DispatchGlobalAnnouncement($"Именем аспекта являлось: {aspect.Name}", playSound: false, - colorOverride: Color.Aquamarine); + + _chatSystem.DispatchGlobalAnnouncement($"Именем аспекта являлось: {aspect.Name}", + sender: aspect.Sender ??= "Центральное Командование", + playSound: false, + colorOverride: Color.Aquamarine); } _audio.PlayGlobal(aspect.EndAudio, Filter.Broadcast(), true); } -#region Helpers + #region Helpers /// /// Forces this aspect to end prematurely. @@ -140,5 +145,5 @@ public abstract class AspectSystem : GameRuleSystem where T : Component return grids.Count > 0; } -#endregion + #endregion } diff --git a/Resources/Prototypes/_White/Aspects/Aspects.yml b/Resources/Prototypes/_White/Aspects/Aspects.yml index 2ad69ca632..722bafbf83 100644 --- a/Resources/Prototypes/_White/Aspects/Aspects.yml +++ b/Resources/Prototypes/_White/Aspects/Aspects.yml @@ -5,7 +5,8 @@ components: - type: Aspect name: Акценты вне контроля - description: Всегда интересно, какой акцент вы услышите следующим + sender: Федерация Космических Волшебников + description: Всегда интересно, какой акцент вы услышите следующим. weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -18,7 +19,7 @@ components: - type: Aspect name: Fast and Furious - description: Люди спешат и не важно куда + description: Новейшие разработки в области фильтрации питьевой воды привели к непредвиденным результатам. КПД двигательных систем большинства органических и неорганических существ возрос на 60%! weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -58,7 +59,7 @@ components: - type: Aspect name: Drunk - description: На станции стоит явный запах вчерашнего веселья... и кажется оно только начинается + description: На станции стоит явный запах вчерашнего веселья... и кажется оно только начинается. weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -71,7 +72,7 @@ components: - type: Aspect name: Cargo Rich - description: Карго работало усердно в прошлую смену, за что они и были награждены премией в размере 100000 кредитов + description: Карго работало усердно в прошлую смену, за что они и были награждены премией в размере 100000 кредитов. weight: 2 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -97,7 +98,7 @@ components: - type: Aspect name: Weak Walls - description: На стенах явно экономили + description: В связи с невыполнением экономических показателей за предыдущий финансовый период - было принято решение на экономии строительных материалов для стен. weight: 2 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -110,7 +111,7 @@ components: - type: Aspect name: No engine - description: Какой-то смышлённый агент синдиката решил украсть все ваши генераторы энергии целиком + description: Какой-то смышлённый агент синдиката решил украсть все ваши генераторы энергии целиком. weight: 2 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -123,7 +124,8 @@ components: - type: Aspect name: Airunlock - description: Кого волнует безопасность? Экипаж свободно может ходить по всем отсекам, ведь все шлюзы теперь для них доступны + sender: Федерация Космических Волшебников + description: Кого волнует безопасность? Экипаж свободно может ходить по всем отсекам, ведь все шлюзы теперь для них доступны. weight: 2 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -137,7 +139,8 @@ components: - type: Aspect name: Bloody - description: В эту смену любая незначительная травма может оказаться летальной + sender: Федерация Космических Волшебников + description: В эту смену любая незначительная травма может оказаться летальной. weight: 2 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -150,6 +153,7 @@ components: - type: Aspect name: Weak + sender: Федерация Космических Волшебников description: Удары стали слабее. Пули мягче. К чему это приведёт? weight: 1 startAudio: @@ -163,7 +167,7 @@ components: - type: Aspect name: Battled - description: Люди очень насторожены и готовы дать отпор в любую секунду + description: Люди очень насторожены и готовы дать отпор в любую секунду. weight: 1 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -189,6 +193,7 @@ components: - type: Aspect name: Presents + sender: Федерация Космических Волшебников description: А вы верите в Деда Мороза? weight: 3 startAudio: @@ -202,6 +207,7 @@ components: - type: Aspect name: Dance + sender: Федерация Космических Волшебников description: Танцуют все! weight: 3 startAudio: @@ -215,7 +221,8 @@ components: - type: Aspect name: Reflect - description: Ваше отражение повсюду + sender: Федерация Космических Волшебников + description: Ваше отражение повсюду. weight: 2 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -228,7 +235,8 @@ components: - type: Aspect name: Slippery - description: Постарайтесь не поскальзываться! + sender: Федерация Космических Волшебников + description: Постарайтесь не подскальзываться! weight: 2 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -241,7 +249,7 @@ components: - type: Aspect name: Extra TC - description: Синдикат выделил 10 дополнительных телекристаллов для предателей + description: Синдикат выделил 10 дополнительных телекристаллов для предателей. requires: Traitors weight: 3 isHidden: true @@ -254,7 +262,8 @@ components: - type: Aspect name: Whisper - description: Из-за боли в горле речь дается вам с трудом + sender: Федерация Космических Волшебников + description: Вы слишком шумные, мы запрещаем вам повышать голос! weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -268,6 +277,7 @@ components: - type: Aspect name: Darkness + sender: Федерация Космических Волшебников description: Почему все так темно? weight: 2 startAudio: @@ -281,7 +291,7 @@ components: - type: Aspect name: Stolen Floor - description: Рабочие забыли положить плитку при строительстве станции + description: Рабочие забыли положить плитку при строительстве станции. weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -294,7 +304,7 @@ components: - type: Aspect name: Are We In Dungeon - description: В связи с невероятной хрупкостью окон было решено заменить их на стены + description: В связи с невероятной хрупкостью окон было решено заменить их на стены. weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -307,7 +317,7 @@ components: - type: Aspect name: Cat Ears And Tail - description: Из-за ошибки в системе клонирования на ЦК все члены экипажа стали походить на фелинидов + description: Из-за ошибки в системе клонирования на ЦК все члены экипажа стали походить на фелинидов. weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -333,7 +343,7 @@ components: - type: Aspect name: Random item - description: ЦК выдало каждому члену экипажа определённый предмет + description: ЦК выдало каждому члену экипажа определённый предмет. weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg @@ -346,7 +356,7 @@ components: - type: Aspect name: Immersive - description: В связи с недавними трагичными событиями экипаж станции погрузился в себя + description: В связи с недавними трагичными событиями экипаж станции погрузился в себя. weight: 3 startAudio: path: /Audio/White/Aspects/accent.ogg From f263e5f7b9722045e11ef1b38eddb73b82f35024 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 5 Jan 2025 16:14:52 +0000 Subject: [PATCH 07/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 48064d86b8..22d3a78124 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,12 +1,4 @@ Entries: -- author: Valtos - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u0440\u0438\u0437\ - \u0440\u0430\u043A Krokozyabra." - type: Add - id: 151 - time: '2024-02-21T10:30:04.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/106 - author: Valtos changes: - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043F\u0435\u0440\u0435\u0437\u0430\ @@ -8878,3 +8870,12 @@ id: 650 time: '2025-01-04T21:01:53.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/871 +- author: Ivangelion + changes: + - message: "\u041F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u044B\ + \ \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u044F \u0430\u0441\u043F\u0435\u043A\ + \u0442\u043E\u0432." + type: Tweak + id: 651 + time: '2025-01-05T16:13:49.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/860 From 4e43f462597bf0d17c4fd8a63c5f29a612d4ba4d Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 5 Jan 2025 20:41:35 +0000 Subject: [PATCH 08/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 42 +++++++++++++++++++------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 22d3a78124..96c53885ff 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,15 +1,4 @@ Entries: -- author: Valtos - changes: - - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043F\u0435\u0440\u0435\u0437\u0430\ - \u043F\u0443\u0441\u043A\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0434\ - \u043E\u043B\u0436\u043D\u044B \u0431\u044B\u0442\u044C \u043F\u043B\u0430\u0432\ - \u043D\u044B\u043C\u0438 \u0438 \u0431\u0435\u0437 \u0432\u044B\u043B\u0435\u0442\ - \u043E\u0432." - type: Add - id: 152 - time: '2024-02-21T11:07:26.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/107 - author: Aviu changes: - message: "\u041F\u0440\u0435\u0434\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\ @@ -8879,3 +8868,34 @@ id: 651 time: '2025-01-05T16:13:49.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/860 +- author: BIG_ZI_348 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\ + \u0430\u044F \u0447\u0435\u0440\u0442\u0430: \u0445\u0440\u043E\u043C\u043E\u0442\ + \u0430 (\u0438\u0434\u0451\u0442 \u0432 \u043A\u043E\u043C\u043F\u043B\u0435\ + \u043A\u0442\u0435 \u0441 \u0442\u0440\u043E\u0441\u0442\u044C\u044E)." + type: Add + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043F\u043E\ + \u0432\u0435\u0434\u0435\u043D\u0438\u0435 \u043F\u0440\u0438 \u043F\u043E\u043F\ + \u044B\u0442\u043A\u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\ + \u0435\u0441\u043A\u0438 \u0432\u0441\u0442\u0430\u0442\u044C \u0431\u0443\u0434\ + \u0443\u0447\u0438 \u043C\u0451\u0440\u0442\u0432\u044B\u043C." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\ + \u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0443\u0432\u0435\u0434\ + \u043E\u043C\u043B\u0435\u043D\u0438\u044F \u043F\u0440\u0438 \u043F\u043E\u043F\ + \u044B\u0442\u043A\u0435 \u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0438\u0442\ + \u044C \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\u0430 \u0438\u043C\u043F\ + \u043B\u0430\u043D\u0442\u0435\u0440\u043E\u043C." + type: Fix + - message: "\u0418\u043D\u0441\u043F\u0435\u043A\u0442\u043E\u0440 \u0442\u0435\u043F\ + \u0435\u0440\u044C \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0447\u0430\ + \u0441\u0442\u044C\u044E \u043A\u043E\u043C\u0430\u043D\u0434\u043E\u0432\u0430\ + \u043D\u0438\u044F." + type: Fix + - message: "\u041F\u0440\u0430\u0432\u043A\u0438 \u043F\u0435\u0440\u0435\u0432\u043E\ + \u0434\u043E\u0432 \u043C\u0435\u043B\u043E\u0447\u0435\u0439." + type: Fix + id: 652 + time: '2025-01-05T20:40:31.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/872 From 785a6c8d1aeef53a0154eaf16e194932d7f03d5a Mon Sep 17 00:00:00 2001 From: keslik Date: Mon, 6 Jan 2025 12:05:42 +0300 Subject: [PATCH 09/11] Add: fluff ghost --- .../Prototypes/_White/Ghosts/custom_ghosts.yml | 9 +++++++++ .../Feda_Plevajecki-ghost.rsi/animated.png | Bin 0 -> 14917 bytes .../Ghosts/Feda_Plevajecki-ghost.rsi/meta.json | 15 +++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/animated.png create mode 100644 Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json diff --git a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml index 283385766c..558ae3349d 100644 --- a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml +++ b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml @@ -492,3 +492,12 @@ alpha: 0.9 ghostName: nekovich ghostDescription: Law's Left Hand. + +#Feda_Plevajecki +- type: customGhost + id: Feda_Plevajecki-ghost + ckey: Feda_Plevajecki + sprite: White/Ghosts/Feda_Plevajecki-ghost.rsi + alpha: 0.9 + ghostName: Шарки + ghostDescription: Буль-буль. diff --git a/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/animated.png b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/animated.png new file mode 100644 index 0000000000000000000000000000000000000000..0c62580a94690f44e8745031d55c11b016a66365 GIT binary patch literal 14917 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json new file mode 100644 index 0000000000..6debd6afad --- /dev/null +++ b/Resources/Textures/White/Ghosts/Feda_Plevajecki-ghost.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", +"copyright": "Made by Dosharus", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "animated", + "directions": 4 + } + ] +} From 4c6c09d0dbd1a43260ad44a2c26c257c07f199a6 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Mon, 6 Jan 2025 21:04:56 +0000 Subject: [PATCH 10/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 31 ++++++++++++++++++-------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 96c53885ff..d3c2469178 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,13 +1,4 @@ Entries: -- author: Aviu - changes: - - message: "\u041F\u0440\u0435\u0434\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\ - \u0439 \u043D\u043E\u0436 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432\ - \ \u0430\u043F\u043B\u0438\u043D\u043A." - type: Add - id: 153 - time: '2024-02-23T22:59:03.0000000+00:00' - url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/112 - author: Aviu changes: - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\ @@ -8899,3 +8890,25 @@ id: 652 time: '2025-01-05T20:40:31.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/872 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0441\u043F\u0440\ + \u0430\u0439\u0442 \u043A\u0435\u043F\u043A\u0438 \u0433\u0440\u0443\u0437\u0447\ + \u0438\u043A\u0430." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\ + \ \u0432 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0435 \u043B\u043E\ + \u0433\u0438\u043A\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D\u0438\ + \u044F \u043E\u0442 \u0433\u043E\u043B\u043E\u0434\u0430 \u0438 \u0436\u0430\ + \u0436\u0434\u044B." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0446\u0435\ + \u043D\u0430 \u0445\u0438\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043A\ + \u0430\u0440\u0442\u0440\u0438\u0434\u0436\u0435\u0439." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043C\u0435\ + \u043B\u043E\u0447\u0438." + type: Fix + id: 653 + time: '2025-01-06T21:03:52.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/874 From 32747f5cbe6a4b4e5185fe31a9aaafddbb041e4f Mon Sep 17 00:00:00 2001 From: keslik Date: Tue, 7 Jan 2025 12:28:11 +0300 Subject: [PATCH 11/11] Tweak: size --- Resources/Prototypes/_White/Ghosts/custom_ghosts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml index 558ae3349d..0e4aa303af 100644 --- a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml +++ b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml @@ -501,3 +501,4 @@ alpha: 0.9 ghostName: Шарки ghostDescription: Буль-буль. + size: 0.7, 0.7