(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00
parent b08a31a68f
commit cc122f2bbf
52 changed files with 601 additions and 786 deletions
@@ -276,9 +276,10 @@ namespace Barotrauma
            }

            StairDirection = Prefab.StairDirection;
-
            SerializableProperties = SerializableProperty.GetProperties(this);
-                      
+
+            InitProjSpecific();
+
            if (Prefab.Body)
            {
                Bodies = new List<Body>();
@@ -307,6 +308,8 @@ namespace Barotrauma
            InsertToList();
        }

+        partial void InitProjSpecific();
+
        public override string ToString()
        {
            return Name;