(c15419d90) Changelog additions + merge fix

Barotrauma/BarotraumaClient/Source/Characters/Character.cs

@@ -136,7 +136,6 @@ namespace Barotrauma
                         break;
                 }
             }
-        }
 
             hudProgressBars = new Dictionary<object, HUDProgressBar>();
         }

Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs

@@ -271,10 +271,6 @@ namespace Barotrauma
                 DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace);
                 return;
             }
-        }
-
-            characterInfos.Add(characterInfo);
-        }
 
             characterInfos.Add(characterInfo);
         }
@@ -602,7 +598,7 @@ namespace Barotrauma
                 characterListBox.BarScroll = roundedPos;
             }
 
-            return radioItem.GetComponent<WifiComponent>();
+            return false;
         }
 
         private IEnumerable<object> KillCharacterAnim(GUIComponent component)
@@ -615,12 +611,6 @@ namespace Barotrauma
             {
                 comp.Color = Color.DarkRed;
             }
-            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
-                c.AIController is HumanAIController &&
-                !c.IsDead &&
-                c.SpeechImpediment <= 100.0f);
-            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
-        }
 
             yield return new WaitForSeconds(1.0f);
 

Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs

@@ -1403,23 +1403,7 @@ namespace Barotrauma
 
         private void TryDeleteSub(Submarine sub)
         {
-            if (sub == null) { return; }
-
-            if (sub.IsVanillaSubmarine())
-            {
-                GUI.AddMessage(TextManager.Get("CannotEditVanillaSubs"), Color.Red, font: GUI.LargeFont);
-                return;
-            }
-
-            string pathToCompare = sub.FilePath.Replace(@"\", @"/").ToLowerInvariant();
-            foreach (ContentPackage cp in ContentPackage.List)
-            {
-                if (cp.Files.Any(f => f.Path.Replace(@"\", @"/").ToLowerInvariant() == pathToCompare))
-                {
-                    new GUIMessageBox("", TextManager.Get("CannotRemoveContentPackageSub").Replace("[contentpackage]", cp.Name));
-                    return;
-                }
-            }
+            if (sub == null) return;
             
             var msgBox = new GUIMessageBox(
                 TextManager.Get("DeleteDialogLabel"),