Merge branch 'master' into new-netcode

Conflicts: Subsurface/Source/Events/MonsterEvent.cs
2017-03-21 18:16:25 +02:00
parent c016bee124 7c6ea5b1c0
commit 2722d3cf8d
8 changed files with 159 additions and 85 deletions
@@ -252,7 +252,7 @@ namespace Barotrauma
                    
                    suicideButton.ToolTip = GameMain.NetworkMember == null ?
                        "The character can no longer be revived if you give in." :
-                        "Let go of your character and enter spectator mode (other players will now longer be able to revive you)";
+                        "Let go of your character and enter spectator mode (other players will no longer be able to revive you)";

                    suicideButton.OnClicked = (button, userData) =>
                    {