Merge remote-tracking branch 'WD-core/master' into upstream-core

Content.Shared/Chat/Prototypes/EmotePrototype.cs

@@ -35,7 +35,7 @@ public sealed partial class EmotePrototype : IPrototype
     [DataField("chatTriggers")]
     public HashSet<string>? ChatTriggers = new();
 
-    /// <summary> Giedi Prime EDIT Start
+    /// <summary> PARSEC EDIT Start
     ///     Текст для кнопки в эмоут меню.
     ///     Бля ну или как это описать, вы поняли короче. ¯\_(ツ)_/¯
     /// </summary>
@@ -44,7 +44,7 @@ public sealed partial class EmotePrototype : IPrototype
 
     [DataField("allowMenu")]
     public bool AllowToEmotionsMenu { get; } = false;
-    // Giedi Prime EDIT end
+    // PARSEC EDIT end
 }
 
 /// <summary>

Content.Shared/Silicons/Borgs/SharedBorgSystem.cs

@@ -21,8 +21,8 @@ public abstract partial class SharedBorgSystem : EntitySystem
     [Dependency] protected readonly SharedContainerSystem Container = default!;
     [Dependency] protected readonly ItemSlotsSystem ItemSlots = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
-    [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; // Amour
-    [Dependency] protected readonly IRobustRandom RobustRandom = default!; // Amour
+    [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; // PARSEC EDIT
+    [Dependency] protected readonly IRobustRandom RobustRandom = default!; // PARSEC EDIT
 
     private HashSet<TTSVoicePrototype> _voices = new();
 
@@ -45,7 +45,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
         GenerateVoiceList(); // WD edit
     }
 
-    // Giedi added
+    // PARSEC added
     private void EnsureRandomTTS(EntityUid uid, SharedTTSComponent component, ComponentInit args)
     {
         if (!HasComp<BorgChassisComponent>(uid))
@@ -63,7 +63,7 @@ public abstract partial class SharedBorgSystem : EntitySystem
             .Where(x => x.BorgVoice)
             .ToHashSet();
     }
-    // Amour
+    // PARSEC added
 
     private void OnItemSlotInsertAttempt(EntityUid uid, BorgChassisComponent component, ref ItemSlotInsertAttemptEvent args)
     {