v0.10.5.1

2020-09-22 11:31:56 -03:00
parent 44032d0ae0
commit 0002ad2c50
343 changed files with 12276 additions and 5023 deletions
@@ -114,7 +114,7 @@ namespace Barotrauma
            }
 #if CLIENT
            AddCharacterToCrewList(character);
-            DisplayCharacterOrder(character, character.CurrentOrder, character.CurrentOrderOption);
+            AddCurrentOrderIcon(character, character.CurrentOrder, character.CurrentOrderOption);
 #endif
        }

@@ -193,7 +193,8 @@ namespace Barotrauma
 #endif
            }

-            conversationTimer = Rand.Range(5.0f, 10.0f);
+            //longer delay in multiplayer to prevent the server from triggering NPC conversations while the players are still loading the round
+            conversationTimer = IsSinglePlayer ? Rand.Range(5.0f, 10.0f) : Rand.Range(45.0f, 60.0f);
        }

        public void FireCharacter(CharacterInfo characterInfo)