(221f9f2a6) Merge branch 'dev' into capitalizationfixes

Barotrauma/BarotraumaServer/Source/Networking/RespawnManager.cs

@@ -232,7 +232,7 @@ namespace Barotrauma.Networking
                 //add the ID card tags they should've gotten when spawning in the shuttle
                 foreach (Item item in character.Inventory.Items)
                 {
-                    if (item == null || item.Prefab.Name != "ID Card") continue;
+                    if (item == null || item.Prefab.Identifier != "idcard") continue;
                     foreach (string s in shuttleSpawnPoints[i].IdCardTags)
                     {
                         item.AddTag(s);

Barotrauma/BarotraumaServer/Source/Networking/SteamManager.cs

@@ -37,7 +37,7 @@ namespace Barotrauma.Steam
 
         public static bool RefreshServerDetails(Networking.GameServer server)
         {
-            if (instance == null || !instance.isInitialized)
+            if (instance?.server == null || !instance.isInitialized)
             {
                 return false;
             }