Unstable 0.1400.2.0 (a mimir edition)

2021-05-28 19:04:09 +03:00
parent 5bc850cddb
commit 0b3fb5e440
126 changed files with 1623 additions and 787 deletions
@@ -179,7 +179,7 @@ namespace Barotrauma
        {
            if (speaker == null) { return; }
            speaker.CampaignInteractionType = CampaignMode.InteractionType.None;
-            speaker.ActiveConversation = this;
+            speaker.ActiveConversation = null;
            speaker.SetCustomInteract(null, null);
 #if SERVER
            GameMain.NetworkMember.CreateEntityEvent(speaker, new object[] { NetEntityEvent.Type.AssignCampaignInteraction });