(221f9f2a6) Merge branch 'dev' into capitalizationfixes

2019-06-04 15:38:31 +03:00
parent f797235bfd
commit e592c49fa8
22 changed files with 97 additions and 72 deletions
@@ -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);