Welcome to Bug Fixing Day! (#487)

Litogin · web-flow · commit af3cf4f48a07 · 2026-03-02T23:03:12.000+03:00
* Fix BUG PRT-201

Перезаход ломает языки

* detected anomaly injectors

* Канилуц to Канилунц

* No translate languages

* fix UninitializedSaveTest

* Update base_borg_chassis.yml

* fixShotGun
diff --git a/Content.Client/_WL/Languages/ClientLanguagesSystem.cs b/Content.Client/_WL/Languages/ClientLanguagesSystem.cs
@@ -16,6 +16,7 @@ public override void Initialize()
         SubscribeNetworkEvent<LanguageChangeEvent>(OnGlobalLanguageChange);
         SubscribeNetworkEvent<LanguagesSyncEvent>(OnLanguagesSync);
 
+        SubscribeLocalEvent<LanguagesComponent, ComponentInit>(OnLanguageCommponentSyns);
         SubscribeLocalEvent<LanguagesComponent, LanguageChangeEvent>(OnLocalLanguageChange);
     }
 
@@ -40,6 +41,14 @@ public override void Initialize()
         return prototypes;
     }
 
+    public void OnLanguageCommponentSyns(EntityUid entity, LanguagesComponent comp, ComponentInit args)
+    {
+        var net_ent = GetNetEntity(entity);
+        var ev = new LanguageSyncRequestEvent(net_ent, comp.Speaking, comp.Understood);
+
+        RaiseNetworkEvent(ev);
+    }
+
     public void OnLocalLanguageChange(EntityUid entity, LanguagesComponent comp, ref LanguageChangeEvent args)
     {
         OnLanguageChange(entity, (string)args.Language);
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Interaction;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
+using Content.Shared._WL.Languages.Components; // WL-Changes
 using Content.Shared.Chat;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
@@ -174,6 +175,16 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref
         if (uid == args.RadioSource)
             return;
 
+        // WL-Changes-Start
+        if (TryComp<LanguagesComponent>(uid, out var languagesRadio))
+        {
+            if (TryComp<LanguagesComponent>(args.MessageSource, out var languagesSource))
+            {
+                languagesRadio.CurrentLanguage = languagesSource.CurrentLanguage;
+            }
+        }
+        // WL-Changes-End
+
         var nameEv = new TransformSpeakerNameEvent(args.MessageSource, Name(args.MessageSource));
         RaiseLocalEvent(args.MessageSource, nameEv);
 
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech;
 using Content.Shared.Speech;
+using Content.Shared._WL.Languages.Components; // WL-Changes
 using Content.Shared.Chat;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
@@ -31,6 +32,16 @@ private void OnSpeechSent(EntityUid uid, SurveillanceCameraSpeakerComponent comp
             return;
         }
 
+        // WL-Changes-Start
+        if (TryComp<LanguagesComponent>(uid, out var languagesSpeech))
+        {
+            if (TryComp<LanguagesComponent>(args.Speaker, out var languagesSpeaker))
+            {
+                languagesSpeech.CurrentLanguage = languagesSpeaker.CurrentLanguage;
+            }
+        }
+        // WL-Changes-end
+
         var time = _gameTiming.CurTime;
         var cd = TimeSpan.FromSeconds(component.SpeechSoundCooldown);
 
diff --git a/Content.Server/_WL/Languages/LanguagesSystem.cs b/Content.Server/_WL/Languages/LanguagesSystem.cs
@@ -44,6 +44,7 @@ public override void Initialize()
 
         SubscribeNetworkEvent<LanguageChangeEvent>(OnGlobalLanguageChange);
         SubscribeNetworkEvent<LanguagesSyncEvent>(OnLanguagesSync);
+        SubscribeNetworkEvent<LanguageSyncRequestEvent>(OnLanguageSyncRequest);
     }
 
     public void AddLanguage(EntityUid ent, string language)
@@ -136,6 +137,17 @@ public void OnLanguagesSync(LanguagesSyncEvent msg, EntitySessionEventArgs args)
         Dirty(entity, component);
     }
 
+    public void OnLanguageSyncRequest(LanguageSyncRequestEvent msg, EntitySessionEventArgs args)
+    {
+        var entity = _ent.GetEntity(msg.Entity);
+        if (!TryComp<LanguagesComponent>(entity, out var component))
+            return;
+
+        if (component.Speaking != msg.Speaking ||
+            component.Understood != msg.Understood)
+            SyncLanguages(msg.Entity, component);
+    }
+
     public void OnGlobalLanguageChange(LanguageChangeEvent msg, EntitySessionEventArgs args)
     {
         var entity = _ent.GetEntity(msg.Entity);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -240,15 +240,33 @@ private void OnBallisticTakeAmmo(Entity<BallisticAmmoProviderComponent> ent, ref
         for (var i = 0; i < args.Shots; i++)
         {
             EntityUid? ammoEntity = null;
+
+
             if (ent.Comp.Entities.Count > 0)
             {
-                if (!ent.Comp.AutoCycle) //WL - if autocycle=false don't remove spent ammo from the gun
-                    break;
+                //WL - Autocycle start
                 var existingEnt = ent.Comp.Entities[^1];
-                ent.Comp.Entities.RemoveAt(ent.Comp.Entities.Count - 1);
-                DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities));
-                Containers.Remove(existingEnt, ent.Comp.Container);
-                ammoEntity = existingEnt;
+
+                if (!TryComp<CartridgeAmmoComponent>(existingEnt, out var cartridge))
+                    return;
+                //WL - Autocycle end
+
+                //WL - Autocycle start
+                if (cartridge.Spent)
+                {
+                    if (!ent.Comp.AutoCycle) //WL - if autocycle=false don't remove spent ammo from the gun
+                        break;
+                    ent.Comp.Entities.RemoveAt(ent.Comp.Entities.Count - 1);
+                    DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities));
+                    Containers.Remove(existingEnt, ent.Comp.Container);
+                    ammoEntity = existingEnt;
+                }
+                else
+                {
+                    DirtyField(ent.AsNullable(), nameof(BallisticAmmoProviderComponent.Entities));
+                    ammoEntity = existingEnt;
+                }
+                //WL - Autocycle end
             }
             else if (ent.Comp.UnspawnedCount > 0)
             {
diff --git a/Content.Shared/_WL/Anomaly/Components/InnerBodyAnomalyDetectedComponent.cs b/Content.Shared/_WL/Anomaly/Components/InnerBodyAnomalyDetectedComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Anomaly.Effects;
+
+namespace Content.Shared._WL.Anomaly.Components;
+
+/// <summary>
+/// On contact with an entity, if it meets the conditions, it will transfer the specified components to it
+/// </summary>
+[RegisterComponent]
+public sealed partial class InnerBodyAnomalyDetectedComponent : Component
+{
+}
diff --git a/Content.Shared/_WL/Languages/LanguagesEvents.cs b/Content.Shared/_WL/Languages/LanguagesEvents.cs
@@ -67,6 +67,23 @@ public LanguagesSyncEvent(NetEntity entity, List<ProtoId<LanguagePrototype>> spe
     }
 }
 
+[Serializable, NetSerializable]
+public sealed partial class LanguageSyncRequestEvent : EntityEventArgs
+{
+    public NetEntity Entity { get; }
+
+    public List<ProtoId<LanguagePrototype>> Speaking { get; }
+
+    public List<ProtoId<LanguagePrototype>> Understood { get; }
+
+    public LanguageSyncRequestEvent(NetEntity entity, List<ProtoId<LanguagePrototype>> speaking, List<ProtoId<LanguagePrototype>> understood)
+    {
+        Entity = entity;
+        Speaking = speaking;
+        Understood = understood;
+    }
+}
+
 [Serializable, NetSerializable]
 public sealed class LanguageSoundEvent : EntityEventArgs
 {
diff --git a/Content.Shared/_WL/Languages/SharedLanguagesSystem.cs b/Content.Shared/_WL/Languages/SharedLanguagesSystem.cs
@@ -8,6 +8,7 @@
 using Robust.Shared.Timing;
 using System.Collections.Frozen;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Text;
 
 namespace Content.Shared._WL.Languages;
@@ -52,7 +53,7 @@ private void CacheLanguages()
     {
         _prototype.TryIndex(id, out var proto);
         return proto;
-    }
+    }   
 
     public void OnRadioLanguageCheck(EntityUid source, LanguagesComponent comp, ref RadioLanguageCheckEvent args)
     {
diff --git a/Resources/Locale/ru-RU/_WL/languages/traits.ftl b/Resources/Locale/ru-RU/_WL/languages/traits.ftl
@@ -9,7 +9,7 @@ trait-language-oldearth-desc = Человеческий язык. Крайне 
 trait-language-sinta = Синта'Унати
 trait-language-sinta-desc = Наиболее популярный язык среди унатхов.
 
-trait-language-vulpa = Канилуц
+trait-language-vulpa = Канилунц
 trait-language-vulpa-desc = Наиболее популярный язык среди вульпканинов.
 
 trait-language-urhs = Урсахский
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -257,6 +257,28 @@
   - type: TTS # Corvax-TTS
     voice: TrainingRobot
   - type: MobCollision # WL-Changes: MobCollision works for players only
+  # WL-Changes-start
+  - type: Languages
+    speaking:
+      - Translate
+    understood:
+      - Translate
+      - BottomTranslate
+      - Kuniluc
+      - OldEarth
+      - RootSpeak
+      - Sarengis
+      - SikTair
+      - SintaUnati
+      - Slimish
+      - TopTranslate
+      - Urhas
+      - Urlum
+      - VoxPigin
+      - Weaver
+      - Wingdings
+    specieLanguage: Ternary
+  # WL-Changes-end
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -24,7 +24,8 @@
   - type: Tag
     tags:
     - Radio
-
+  - type: Languages # WL-Changes
+  
 - type: entity
   name: security radio
   description: A handy security radio.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
@@ -97,6 +97,7 @@
     range: 20
     components:
     - type: Anomaly
+    - type: InnerBodyAnomalyDetected # WL-Changes
   - type: Beeper
     isMuted: true
     minBeepInterval: 0.15
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -1385,6 +1385,7 @@
           type: SurveillanceCameraMonitorBoundUserInterface
         enum.WiresUiKey.Key:
           type: WiresBoundUserInterface
+  - type: Languages # WL-Changes
 
 - type: entity
   parent: ComputerSurveillanceWirelessCameraMonitor
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml
@@ -27,6 +27,7 @@
     whitelist:
       tags:
       - AnomalyHost
+  - type: InnerBodyAnomalyDetected # WL-Changes
 
 - type: entity
   parent: BaseAnomalyInjector
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml
@@ -57,6 +57,7 @@
               params:
                 volume: -4
   - type: StationAiWhitelist
+  - type: Languages # WL-Changes
 
 - type: entity
   parent: BaseWallmountGlass

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public override void Initialize()`
`16`	`16`	`SubscribeNetworkEvent<LanguageChangeEvent>(OnGlobalLanguageChange);`
`17`	`17`	`SubscribeNetworkEvent<LanguagesSyncEvent>(OnLanguagesSync);`
`18`	`18`
	`19`	`+ SubscribeLocalEvent<LanguagesComponent, ComponentInit>(OnLanguageCommponentSyns);`
`19`	`20`	`SubscribeLocalEvent<LanguagesComponent, LanguageChangeEvent>(OnLocalLanguageChange);`
`20`	`21`	`}`
`21`	`22`
`@@ -40,6 +41,14 @@ public override void Initialize()`
`40`	`41`	`return prototypes;`
`41`	`42`	`}`
`42`	`43`
	`44`	`+ public void OnLanguageCommponentSyns(EntityUid entity, LanguagesComponent comp, ComponentInit args)`
	`45`	`+ {`
	`46`	`+ var net_ent = GetNetEntity(entity);`
	`47`	`+ var ev = new LanguageSyncRequestEvent(net_ent, comp.Speaking, comp.Understood);`
	`48`	`+`
	`49`	`+ RaiseNetworkEvent(ev);`
	`50`	`+ }`
	`51`	`+`
`43`	`52`	`public void OnLocalLanguageChange(EntityUid entity, LanguagesComponent comp, ref LanguageChangeEvent args)`
`44`	`53`	`{`
`45`	`54`	`OnLanguageChange(entity, (string)args.Language);`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using Robust.Shared.Timing;`
`9`	`9`	`using System.Collections.Frozen;`
`10`	`10`	`using System.Diagnostics.CodeAnalysis;`
	`11`	`+using System.Linq;`
`11`	`12`	`using System.Text;`
`12`	`13`
`13`	`14`	`namespace Content.Shared._WL.Languages;`
`@@ -52,7 +53,7 @@ private void CacheLanguages()`
`52`	`53`	`{`
`53`	`54`	`_prototype.TryIndex(id, out var proto);`
`54`	`55`	`return proto;`
`55`		`- }`
	`56`	`+ }`
`56`	`57`
`57`	`58`	`public void OnRadioLanguageCheck(EntityUid source, LanguagesComponent comp, ref RadioLanguageCheckEvent args)`
`58`	`59`	`{`