Merge branch 'master' into dedicated-server

# Conflicts:
#	BarotraumaClient/Source/GameSettings.cs
#	BarotraumaClient/Source/Screens/NetLobbyScreen.cs

BarotraumaShared/Source/Characters/Attack.cs

@@ -75,6 +75,14 @@ namespace Barotrauma
             return (Duration == 0.0f) ? structureDamage : structureDamage * deltaTime;
         }
 
+        public Attack(float damage, float structureDamage, float bleedingDamage, float range = 0.0f)
+        {
+            Range = range;
+            this.damage = damage;
+            this.structureDamage = structureDamage;
+            this.bleedingDamage = bleedingDamage;
+        }
+
         public Attack(XElement element)
         {
             try
@@ -111,9 +119,7 @@ namespace Barotrauma
             Duration = ToolBox.GetAttributeFloat(element, "duration", 0.0f); 
 
             priority = ToolBox.GetAttributeFloat(element, "priority", 1.0f);
-
-            statusEffects = new List<StatusEffect>();
-
+            
             foreach (XElement subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
@@ -124,6 +130,10 @@ namespace Barotrauma
                         break;
 #endif
                     case "statuseffect":
+                        if (statusEffects == null)
+                        {
+                            statusEffects = new List<StatusEffect>();
+                        }
                         statusEffects.Add(StatusEffect.Load(subElement));
                         break;
                 }
@@ -150,6 +160,11 @@ namespace Barotrauma
 
             var effectType = attackResult.Damage > 0.0f ? ActionType.OnUse : ActionType.OnFailure;
 
+            if (statusEffects == null)
+            {
+                return attackResult;
+            }
+
             foreach (StatusEffect effect in statusEffects)
             {
                 if (effect.Targets.HasFlag(StatusEffect.TargetType.This) && attacker is Character)