Апстрим 50%

Content.Client/Corvax/TTS/HumanoidProfileEditor.TTS.cs

@@ -4,7 +4,7 @@
 using Content.Shared.Corvax.TTS;
 using Content.Shared.Preferences;
 
-namespace Content.Client.Preferences.UI;
+namespace Content.Client.Lobby.UI;
 
 public sealed partial class HumanoidProfileEditor
 {

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -853,42 +853,6 @@ private void ToggleLoadouts(BaseButton.ButtonEventArgs _)
             //_controller.UpdateCharacterUI();
         }
 
-        private void OnDummyUpdate(EntityUid value)
-        {
-            _previewSpriteView.SetEntity(value);
-        }
-
-        private void UpdateAntagRequirements()
-        {
-            _antagList.DisposeAllChildren();
-            _antagPreferences.Clear();
-
-            foreach (var antag in _prototypeManager.EnumeratePrototypes<AntagPrototype>().OrderBy(a => Loc.GetString(a.Name)))
-            {
-                if (!antag.SetPreference)
-                    continue;
-
-                var selector = new AntagPreferenceSelector(antag,
-                        _jobPriorities.FirstOrDefault(j => j.Priority == JobPriority.High)?.HighJob
-                            ?? new())
-                    { Margin = new Thickness(3f, 3f, 3f, 0f) };
-                _antagList.AddChild(selector);
-                _antagPreferences.Add(selector);
-                if (selector.Disabled)
-                {
-                    Profile = Profile?.WithAntagPreference(antag.ID, false);
-                    IsDirty = true;
-                }
-
-                selector.PreferenceChanged += preference =>
-                {
-                    Profile = Profile?.WithAntagPreference(antag.ID, preference);
-                    IsDirty = true;
-                };
-            }
-
-        }
-
         private void UpdateRoleRequirements()
         {
             JobList.DisposeAllChildren();

Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs

@@ -40,7 +40,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             return;
         }
 
-        _window.UpdateState(cast.Name, cast.Voice, cast.Verb); // LPP-TTS
+        _window.UpdateState(cast.Name, /*cast.Voice, */cast.Verb); // LPP-TTS
     }
 
     protected override void Dispose(bool disposing)

Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs

@@ -97,7 +97,7 @@ private void ReloadVoices(IPrototypeManager proto)
     }
     // LPP-TTS-End
 
-    public void UpdateState(string name, string voice, string? verb) // LPP-TTS
+    public void UpdateState(string name, /*string voice, */string? verb) // LPP-TTS
     {
         NameSelector.Text = name;
         _verb = verb;
@@ -110,11 +110,12 @@ public void UpdateState(string name, string voice, string? verb) // LPP-TTS
                 break;
             }
         }
-
+/*
         // LPP-TTS-Start
         var voiceIdx = _voices.FindIndex(v => v.ID == voice);
         if (voiceIdx != -1)
             VoiceSelector.Select(voiceIdx);
         // LPP-TTS-End
+*/
     }
 }

Content.Server/Chat/Systems/ChatSystem.cs

@@ -1054,6 +1054,20 @@ public record ExpandICChatRecipientstEvent(EntityUid Source, float VoiceRange, D
 {
 }
 
+public sealed class TransformSpeakerNameEvent : EntityEventArgs
+{
+    public EntityUid Sender;
+    public string Name;
+    public string? SpeechVerb;
+
+    public TransformSpeakerNameEvent(EntityUid sender, string name, string? speechVerb = null)
+    {
+        Sender = sender;
+        Name = name;
+        SpeechVerb = speechVerb;
+    }
+}
+
 /// <summary>
 ///     Raised broadcast in order to transform speech.transmit
 /// </summary>

Content.Server/Corvax/TTS/VoiceMaskSystem.TTS.cs

@@ -1,42 +1,44 @@
-using Content.Server.Corvax.TTS;
-using Content.Shared.VoiceMask;
-
-namespace Content.Server.VoiceMask;
-
-public partial class VoiceMaskSystem
-{
-    private void InitializeTTS()
-    {
-        SubscribeLocalEvent<VoiceMaskComponent, TransformSpeakerVoiceEvent>(OnSpeakerVoiceTransform);
-        SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeVoiceMessage>(OnChangeVoice);
-    }
-
-    private void OnSpeakerVoiceTransform(EntityUid uid, VoiceMaskComponent component, TransformSpeakerVoiceEvent args)
-    {
-        if (component.Enabled)
-            args.VoiceId = component.VoiceId;
-    }
-
-    private void OnChangeVoice(EntityUid uid, VoiceMaskComponent component, VoiceMaskChangeVoiceMessage message)
-    {
-        component.VoiceId = message.Voice;
-
-        _popupSystem.PopupEntity(Loc.GetString("voice-mask-voice-popup-success"), uid);
-
-        TrySetLastKnownVoice(uid, message.Voice);
-
-        UpdateUI(uid, component);
-    }
-
-    private void TrySetLastKnownVoice(EntityUid maskWearer, string? voiceId)
-    {
-        if (!HasComp<VoiceMaskComponent>(maskWearer)
-            || !_inventory.TryGetSlotEntity(maskWearer, MaskSlot, out var maskEntity)
-            || !TryComp<VoiceMaskerComponent>(maskEntity, out var maskComp))
-        {
-            return;
-        }
-
-        maskComp.LastSetVoice = voiceId;
-    }
-}
+// Я хз как заставить работать после этого: https://github.com/Simple-Station/Einstein-Engines/pull/1147
+
+// using Content.Server.Corvax.TTS;
+// using Content.Shared.VoiceMask;
+
+// namespace Content.Server.VoiceMask;
+
+// public partial class VoiceMaskSystem
+// {
+//     private void InitializeTTS()
+//     {
+//         SubscribeLocalEvent<VoiceMaskComponent, TransformSpeakerVoiceEvent>(OnSpeakerVoiceTransform);
+//         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeVoiceMessage>(OnChangeVoice);
+//     }
+
+//     private void OnSpeakerVoiceTransform(EntityUid uid, VoiceMaskComponent component, TransformSpeakerVoiceEvent args)
+//     {
+//         if (component.Enabled)
+//             args.VoiceId = component.VoiceId;
+//     }
+
+//     private void OnChangeVoice(EntityUid uid, VoiceMaskComponent component, VoiceMaskChangeVoiceMessage message)
+//     {
+//         component.VoiceId = message.Voice;
+
+//         _popupSystem.PopupEntity(Loc.GetString("voice-mask-voice-popup-success"), uid);
+
+//         TrySetLastKnownVoice(uid, message.Voice);
+
+//         UpdateUI(uid, component);
+//     }
+
+//     private void TrySetLastKnownVoice(EntityUid maskWearer, string? voiceId)
+//     {
+//         if (!HasComp<VoiceMaskComponent>(maskWearer)
+//             || !_inventory.TryGetSlotEntity(maskWearer, MaskSlot, out var maskEntity)
+//             || !TryComp<VoiceMaskerComponent>(maskEntity, out var maskComp))
+//         {
+//             return;
+//         }
+
+//         maskComp.LastSetVoice = voiceId;
+//     }
+// }

Content.Server/Preferences/Managers/ServerPreferencesManager.cs

@@ -134,7 +134,7 @@ public async Task SetProfile(NetUserId userId, int slot, ICharacterProfile profi
                 var tier = sponsor.Tier > 5 ? 5 : sponsor.Tier;
                 allowedMarkings = allowedMarkings.Concat(Loc.GetString($"sponsor-markings-tier-{tier}").Split(";", StringSplitOptions.RemoveEmptyEntries)).ToArray();
             }
-            profile.EnsureValid(session, collection, allowedMarkings);
+            profile.EnsureValid(session, _dependencies, allowedMarkings);
 #else
             profile.EnsureValid(session, _dependencies);
 #endif

Content.Server/VoiceMask/VoiceMaskComponent.cs

@@ -1,6 +1,5 @@
 using Content.Shared.Speech;
 using Robust.Shared.Prototypes;
-using Content.Shared.Humanoid;
 
 namespace Content.Server.VoiceMask;
 
@@ -33,15 +32,9 @@ public sealed partial class VoiceMaskComponent : Component
     [DataField]
     public EntProtoId Action = "ActionChangeVoiceMask";
 
-    // LPP-TTS-Start
-    [DataField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string VoiceId = SharedHumanoidAppearanceSystem.DefaultVoice;
-    // LPP-TTS-End
-
     /// <summary>
     ///     Reference to the action.
     /// </summary>
     [DataField]
     public EntityUid? ActionEntity;
-}
+}

Content.Server/VoiceMask/VoiceMaskSystem.cs

@@ -30,7 +30,6 @@ public override void Initialize()
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeVerbMessage>(OnChangeVerb);
         SubscribeLocalEvent<VoiceMaskComponent, ClothingGotEquippedEvent>(OnEquip);
         SubscribeLocalEvent<VoiceMaskSetNameEvent>(OpenUI);
-        InitializeTTS(); // LPP-TTS
     }
 
     private void OnTransformSpeakerName(Entity<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeakerSpeechEvent> args)
@@ -113,4 +112,4 @@ private string GetCurrentVoiceName(Entity<VoiceMaskComponent> entity)
         return entity.Comp.VoiceMaskName ?? Loc.GetString("voice-mask-default-name-override");
     }
     #endregion
-}
+}

Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs

@@ -87,7 +87,8 @@ public HumanoidCharacterProfile FromStream(Stream stream, ICommonSession session
 
         var profile = export.Profile;
         var collection = IoCManager.Instance;
-        profile.EnsureValid(session, collection!);
+        var sponsorPrototypes = Array.Empty<string>(); //LPP ?? 
+        profile.EnsureValid(session, collection!, sponsorPrototypes); // сломалось, Я хз почему
         return profile;
     }
 

Content.Shared/Preferences/HumanoidCharacterProfile.cs

@@ -118,7 +118,7 @@ public HumanoidCharacterProfile(
         string name,
         string flavortext,
         string species,
-        string voice, // LPP-Tstring customspeciename,
+        string voice, // LPP-TTS
         string customspeciename,
         float height,
         float width,
@@ -233,11 +233,11 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
         }
 
         // LPP-TTS-Start
-            var voiceId = random.Pick(prototypeManager
-                .EnumeratePrototypes<TTSVoicePrototype>()
-                .Where(o => CanHaveVoice(o, sex)).ToArray()
-            ).ID;
-            // LPP-TTS-End
+        var voiceId = random.Pick(prototypeManager
+            .EnumeratePrototypes<TTSVoicePrototype>()
+            .Where(o => CanHaveVoice(o, sex)).ToArray()
+        ).ID;
+        // LPP-TTS-End
 
             var gender = Gender.Epicene;
 
@@ -379,10 +379,10 @@ IDependencyCollection collection
                 || (speciesPrototype.SponsorOnly && !sponsorPrototypes.Contains(Species))   // _LostParadise-Sponsors
 #endif
                 )
-            {
-                Species = SharedHumanoidAppearanceSystem.DefaultSpecies;
-                speciesPrototype = prototypeManager.Index<SpeciesPrototype>(Species);
-            }
+        {
+            Species = SharedHumanoidAppearanceSystem.DefaultSpecies;
+            speciesPrototype = prototypeManager.Index<SpeciesPrototype>(Species);
+        }
 
         var sex = Sex switch
         {
@@ -510,37 +510,37 @@ IDependencyCollection collection
         _traitPreferences.UnionWith(traits);
 
         // LPP-TTS-Start
-            prototypeManager.TryIndex<TTSVoicePrototype>(Voice, out var voice);
-            if (voice is null || !CanHaveVoice(voice, Sex))
-                Voice = SharedHumanoidAppearanceSystem.DefaultSexVoice[sex];
-            // LPP-TTS-End
+        prototypeManager.TryIndex<TTSVoicePrototype>(Voice, out var voice);
+        if (voice is null || !CanHaveVoice(voice, Sex))
+            Voice = SharedHumanoidAppearanceSystem.DefaultSexVoice[sex];
+        // LPP-TTS-End
 
-            _loadoutPreferences.Clear();
-            _loadoutPreferences.UnionWith(loadouts);
+        _loadoutPreferences.Clear();
+        _loadoutPreferences.UnionWith(loadouts);
     }
 
     // LPP-TTS-Start
-        public static bool CanHaveVoice(TTSVoicePrototype voice, Sex sex)
-        {
-            return voice.RoundStart && sex == Sex.Unsexed || (voice.Sex == sex || voice.Sex == Sex.Unsexed);
-        }
-        // LPP-TTS-End
+    public static bool CanHaveVoice(TTSVoicePrototype voice, Sex sex)
+    {
+        return voice.RoundStart && sex == Sex.Unsexed || (voice.Sex == sex || voice.Sex == Sex.Unsexed);
+    }
+    // LPP-TTS-End
 
-        public ICharacterProfile Validated(ICommonSession session,
-            IDependencyCollection collection
+    public ICharacterProfile Validated(ICommonSession session,
+        IDependencyCollection collection
 #if LPP_Sponsors
-                , string[] sponsorPrototypes// _LostParadise-Sponsors
+            , string[] sponsorPrototypes// _LostParadise-Sponsors
 #endif
-            )
-        {
-            var profile = new HumanoidCharacterProfile(this);
-            profile.EnsureValid(session, collection
+        )
+    {
+        var profile = new HumanoidCharacterProfile(this);
+        profile.EnsureValid(session, collection
 #if LPP_Sponsors
-                , sponsorPrototypes// _LostParadise-Sponsors
+            , sponsorPrototypes// _LostParadise-Sponsors
 #endif
-                );
-            return profile;
-        }
+            );
+        return profile;
+    }
 
     // Sorry this is kind of weird and duplicated,
     // Working inside these non entity systems is a bit wack

Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs

@@ -13,13 +13,13 @@ public sealed class VoiceMaskBuiState : BoundUserInterfaceState
 {
     public readonly string Name;
     public readonly string? Verb;
-    public readonly string Voice; // LPP-TTS
+    //public readonly string Voice; // LPP-TTS
 
-    public VoiceMaskBuiState(string name, string voice, string? verb)
+    public VoiceMaskBuiState(string name, /*string voice, */string? verb)
     {
         Name = name;
         Verb = verb;
-        Voice = voice;  // LPP-TTS
+        //Voice = voice;  // LPP-TTS
     }
 }
 

Resources/Prototypes/CharacterItemGroups/securityGroups.yml

@@ -279,8 +279,6 @@
       id: LoadoutSecurityPistolSvalin
     - type: loadout
       id: LoadoutSecurityEnergyGunMini
-    - type: loadout
-      id: LoadoutSecurityEnergyGunPistol
     - type: loadout
       id: LoadoutSecurityPistolPollock
     - type: loadout

Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml

@@ -368,14 +368,3 @@
   sprites:
     - sprite: Mobs/Customization/reptilian_parts.rsi
       state: tail_dtiger_wagging
-
-- type: marking
-  id: LizardSnoutSplotch
-  bodyPart: Snout
-  markingCategory: Snout
-  speciesRestriction: [Reptilian]
-  sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: snout_splotch_primary
-  - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: snout_splotch_secondary