Merge remote-tracking branch 'EE-Personal/Psionic-Power-Refactor' int…

…o Upstream-Merge-7/11/2024
SS14-Classic · Jul 12, 2024 · ba3090f · ba3090f
2 parents 89a7d37 + 2b9d813
commit ba3090f
Show file tree

Hide file tree

Showing 22 changed files with 212 additions and 1,372 deletions.
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
@@ -125,7 +125,6 @@ public override void Init()
             _prototypeManager.RegisterIgnore("alertLevels");
             _prototypeManager.RegisterIgnore("nukeopsRole");
             _prototypeManager.RegisterIgnore("stationGoal");
-            _prototypeManager.RegisterIgnore("npcConversationTree");
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();

diff --git a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
@@ -54,7 +54,7 @@ private void OnClientTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs
         SetTypingIndicatorEnabled(uid.Value, ev.IsTyping);
     }
 
-    public void SetTypingIndicatorEnabled(EntityUid uid, bool isEnabled, AppearanceComponent? appearance = null)
+    private void SetTypingIndicatorEnabled(EntityUid uid, bool isEnabled, AppearanceComponent? appearance = null)
     {
         if (!Resolve(uid, ref appearance, false))
             return;

diff --git a/Content.Server/NPC/Components/NPCConversationComponent.cs b/Content.Server/NPC/Components/NPCConversationComponent.cs
diff --git a/Content.Server/NPC/Events/NPCConversationEvents.cs b/Content.Server/NPC/Events/NPCConversationEvents.cs
diff --git a/Content.Server/NPC/Prototypes/NPCConversationTreePrototype.cs b/Content.Server/NPC/Prototypes/NPCConversationTreePrototype.cs