Hotfix 08.01.26 (#1414)

* hotfix

* hotfix

* fix?

* интеграция языков и фикс статус эффектов

* upd

* fix felinids

* Update PseudoItemSystem.cs

* Update SharedPseudoItemSystem.cs

---------

Co-authored-by: Роман Капитонов <43700376+KayzelW@users.noreply.github.com>

Author: Rxup

Content.Client/Backmen/Blob/BlobObserverSystem.cs

@@ -32,7 +32,7 @@ public override void Initialize()
         SubscribeNetworkEvent<RoundRestartCleanupEvent>(RoundRestartCleanup);
     }
 
-    private readonly ProtoId<FactionIconPrototype>  BlobFaction = "BlobFaction";
+    private static readonly ProtoId<FactionIconPrototype>  BlobFaction = "BlobFaction";
 
     private void OnShowBlobIcon<T>(Entity<T> ent, ref GetStatusIconsEvent args) where T : Component
     {

Content.Client/Backmen/Flesh/FleshCultist.cs

@@ -18,7 +18,7 @@ public override void Initialize()
         SubscribeLocalEvent<FleshCultistComponent, GetStatusIconsEvent>(OnShowCultIcon);
     }
 
-    private readonly ProtoId<FactionIconPrototype> FleshcultistFaction = "FleshcultistFaction";
+    private static readonly ProtoId<FactionIconPrototype> FleshcultistFaction = "FleshcultistFaction";
 
     private void OnShowCultIcon(Entity<FleshCultistComponent> ent, ref GetStatusIconsEvent args)
     {

Content.Client/Backmen/Overlays/Shaders/EtherealOverlay.cs

@@ -15,7 +15,7 @@ public sealed class EtherealOverlay : Overlay
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
     private readonly ShaderInstance _shader;
 
-    private readonly ProtoId<ShaderPrototype> Ethereal = "Ethereal";
+    private static readonly ProtoId<ShaderPrototype> Ethereal = "Ethereal";
 
     public EtherealOverlay()
     {

Content.Client/Backmen/Overlays/Systems/NearsightedSystem.cs

@@ -20,7 +20,7 @@ public override void Initialize()
         _overlay = new Overlays.NearsightedOverlay();
     }
 
-    private readonly ProtoId<TagPrototype> TagName = "GlassesNearsight";
+    private static readonly ProtoId<TagPrototype> TagName = "GlassesNearsight";
 
     public override void Update(float frameTime)
     {

Content.Client/Backmen/StationAI/AiEnemySystem.cs

@@ -22,7 +22,7 @@ public override void Initialize()
         _ghostQuery = GetEntityQuery<GhostComponent>();
     }
 
-    private readonly ProtoId<SecurityIconPrototype> AiEnemyStatus = "AiIconEnemyTarget";
+    private static readonly ProtoId<SecurityIconPrototype> AiEnemyStatus = "AiIconEnemyTarget";
     private void GetIcon(Entity<AIEnemyNTComponent> target, ref GetStatusIconsEvent args)
     {
         var ent = _player.LocalSession?.AttachedEntity ?? EntityUid.Invalid;

Content.Client/Backmen/Teams/TdmTeamSystem.cs

@@ -22,9 +22,9 @@ protected override void SetTeam(Entity<TdmMemberComponent?> target, StationTeamM
         // do nothing on client
     }
 
-    private readonly ProtoId<FactionIconPrototype> TeamA = "TeamAFaction";
-    private readonly ProtoId<FactionIconPrototype> TeamB = "TeamBFaction";
-    private readonly ProtoId<FactionIconPrototype> TeamNoTeam = "Team0Faction";
+    private static readonly ProtoId<FactionIconPrototype> TeamA = "TeamAFaction";
+    private static readonly ProtoId<FactionIconPrototype> TeamB = "TeamBFaction";
+    private static readonly ProtoId<FactionIconPrototype> TeamNoTeam = "Team0Faction";
 
     private void OnGetTeamIcon(Entity<TdmMemberComponent> ent, ref GetStatusIconsEvent args)
     {

Content.Client/Backmen/Vampiric/BloodSuckerSystem.cs

@@ -21,7 +21,7 @@ public override void Initialize()
         SubscribeLocalEvent<BkmVampireComponent, GetStatusIconsEvent>(OnShowVampireIcon);
     }
 
-    private readonly ProtoId<FactionIconPrototype> VampireFaction = "VampireFaction";
+    private static readonly ProtoId<FactionIconPrototype> VampireFaction = "VampireFaction";
 
     private void OnShowVampireIcon(Entity<BkmVampireComponent> ent, ref GetStatusIconsEvent args)
     {

Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs

@@ -64,8 +64,8 @@ namespace Content.Server.Administration.Systems;
 
 public sealed partial class AdminVerbSystem
 {
-    private readonly ProtoId<PolymorphPrototype> LizardSmite = "AdminLizardSmite";
-    private readonly ProtoId<PolymorphPrototype> VulpkaninSmite = "AdminVulpSmite";
+    private static readonly ProtoId<PolymorphPrototype> LizardSmite = "AdminLizardSmite";
+    private static readonly ProtoId<PolymorphPrototype> VulpkaninSmite = "AdminVulpSmite";
 
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -95,7 +95,7 @@ public sealed partial class AdminVerbSystem
     [Dependency] private readonly SlipperySystem _slipperySystem = default!;
 
     private readonly EntProtoId _actionViewLawsProtoId = "ActionViewLaws";
-    private readonly ProtoId<SiliconLawsetPrototype> _crewsimovLawset = "Crewsimov";
+    private static readonly ProtoId<SiliconLawsetPrototype> _crewsimovLawset = "Crewsimov";
 
     private readonly EntProtoId _siliconMindRole = "MindRoleSiliconBrain";
     private const string SiliconLawBoundUserInterface = "SiliconLawBoundUserInterface";

Content.Server/Animals/Systems/ParrotMemorySystem.cs

@@ -8,12 +8,14 @@
 using Content.Server.Vocalization.Systems;
 using Content.Shared.Animals.Components;
 using Content.Shared.Animals.Systems;
+using Content.Shared.Backmen.Language;
 using Content.Shared.Database;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -63,15 +65,15 @@ private void ListenerOnMapInit(Entity<ParrotListenerComponent> entity, ref MapIn
     private void OnListen(Entity<ParrotListenerComponent> entity, ref ListenEvent args)
     {
 
-        TryLearn(entity.Owner, args.Message, args.Source);
+        TryLearn(entity.Owner, args.Message, args.Source, args.Language?.ID ?? "Universal");
     }
 
     private void OnHeadsetReceive(Entity<ParrotListenerComponent> entity, ref HeadsetRadioReceiveRelayEvent args)
     {
         var message = args.RelayedEvent.Message;
         var source = args.RelayedEvent.MessageSource;
 
-        TryLearn(entity.Owner, message, source);
+        TryLearn(entity.Owner, message, source, args.RelayedEvent.Language?.ID ?? "Universal");
     }
 
     /// <summary>
@@ -102,7 +104,8 @@ private void OnTryVocalize(Entity<ParrotMemoryComponent> entity, ref TryVocalize
     /// <param name="entity">Entity learning a new word</param>
     /// <param name="incomingMessage">Message to learn</param>
     /// <param name="source">Source EntityUid of the message</param>
-    public void TryLearn(Entity<ParrotMemoryComponent?, ParrotListenerComponent?> entity, string incomingMessage, EntityUid source)
+    /// <param name="lang"></param>
+    public void TryLearn(Entity<ParrotMemoryComponent?, ParrotListenerComponent?> entity, string incomingMessage, EntityUid source, ProtoId<LanguagePrototype> lang) // backmen
     {
         if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2))
             return;
@@ -142,7 +145,7 @@ public void TryLearn(Entity<ParrotMemoryComponent?, ParrotListenerComponent?> en
             return;
 
         // actually commit this message to memory
-        Learn((entity, entity.Comp1), message, source);
+        Learn((entity, entity.Comp1), message, source, lang);
     }
 
     /// <summary>
@@ -151,7 +154,8 @@ public void TryLearn(Entity<ParrotMemoryComponent?, ParrotListenerComponent?> en
     /// <param name="entity">Entity learning a new word</param>
     /// <param name="message">Message to learn</param>
     /// <param name="source">Source EntityUid of the message</param>
-    private void Learn(Entity<ParrotMemoryComponent> entity, string message, EntityUid source)
+    /// <param name="lang"></param>
+    private void Learn(Entity<ParrotMemoryComponent> entity, string message, EntityUid source, ProtoId<LanguagePrototype> lang) // backmen
     {
         // log a low-priority chat type log to the admin logger
         // specifies what message was learnt by what entity, and who taught the message to that entity
@@ -163,7 +167,7 @@ private void Learn(Entity<ParrotMemoryComponent> entity, string message, EntityU
             sourceNetUserId = mind.UserId;
         }
 
-        var newMemory = new SpeechMemory(sourceNetUserId, message);
+        var newMemory = new SpeechMemory(sourceNetUserId, message, lang);
 
         // add a new message if there is space in the memory
         if (entity.Comp.SpeechMemories.Count < entity.Comp.MaxSpeechMemory)

Content.Server/Backmen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs

@@ -13,6 +13,7 @@
 using Content.Shared.Backmen.Psionics.Events;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Examine;
 using Robust.Server.Audio;
 using static Content.Shared.Examine.ExamineSystemShared;
@@ -90,6 +91,8 @@ private void OnDispelled(EntityUid uid, PsionicRegenerationPowerComponent compon
         args.Handled = true;
     }
 
+    private static readonly ProtoId<ReagentPrototype> PsionicRegenerationEssence = "PsionicRegenerationEssence";
+
     private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationDoAfterEvent args)
     {
         component.DoAfter = null;
@@ -104,7 +107,7 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen
         var percentageComplete = Math.Min(1f, (_gameTiming.CurTime - args.StartedAt).TotalSeconds / component.UseDelay);
 
         var solution = new Solution();
-        solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete));
+        solution.AddReagent(PsionicRegenerationEssence, FixedPoint2.New(component.EssenceAmount * percentageComplete));
         _bloodstreamSystem.TryAddToBloodstream((uid, stream), solution);
     }
 }