Merge branch 'develop' into make-airlocks-move

stilnat · Nov 14, 2023 · aa382a8 · aa382a8
2 parents fa8c45c + b5dfd76
commit aa382a8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 30 deletions.
diff --git a/Assets/Content/Data/TileMap/Resources/Entities/EngiBorg.asset b/Assets/Content/Data/TileMap/Resources/Entities/EngiBorg.asset
diff --git a/Assets/Content/Data/TileMap/Resources/Entities/EngiBorg.asset.meta b/Assets/Content/Data/TileMap/Resources/Entities/EngiBorg.asset.meta
diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableGlass.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableGlass.asset
@@ -16,7 +16,7 @@ MonoBehaviour:
   prefab: {fileID: 2839728781945606427, guid: 4d48472d06930bd42a15897e6a1794ac, type: 3}
   icon: {fileID: 0}
   layer: 7
-  genericType: 0
-  specificType: 0
+  genericType: 7
+  specificType: 1
   width: 1
   height: 1
diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableSteel.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableSteel.asset
@@ -16,7 +16,7 @@ MonoBehaviour:
   prefab: {fileID: 8036950609662249464, guid: 6caa99f8281726e40a793826d5c047db, type: 3}
   icon: {fileID: 0}
   layer: 7
-  genericType: 0
-  specificType: 0
+  genericType: 7
+  specificType: 3
   width: 1
   height: 1
diff --git a/Assets/Content/WorldObjects/Structures/Doors/SecurityAirlock.prefab b/Assets/Content/WorldObjects/Structures/Doors/SecurityAirlock.prefab
@@ -273,6 +273,7 @@ GameObject:
   - component: {fileID: 2079395355536659087}
   - component: {fileID: 7942135432533076774}
   - component: {fileID: -6616120420594439688}
+  - component: {fileID: -3952917033083390060}
   - component: {fileID: -2593019434011219120}
   m_Layer: 0
   m_Name: SecurityAirlock
@@ -352,6 +353,24 @@ MonoBehaviour:
   _interpolation: 2
   _clientAuthoritative: 1
   _sendToOwner: 0
+--- !u!114 &-3952917033083390060
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7133738675197207439}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d00d6a1b2cb9fb54fbefde21a9eb88a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _componentIndexCache: 255
+  _addedNetworkObject: {fileID: 7942135432533076774}
+  _networkObjectCache: {fileID: 0}
+  _syncedConnections: 0
+  wallCapPrefab: {fileID: 3591147544166670882, guid: 9682b163cae64f74a93b6e84ce84ae5b, type: 3}
+  doorType: 0
 --- !u!114 &-2593019434011219120
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Builds/Game/Data/Tilemaps/TestMap.json b/Builds/Game/Data/Tilemaps/TestMap.json
diff --git a/Builds/Game/Data/Tilemaps/UnnamedMap.json b/Builds/Game/Data/Tilemaps/UnnamedMap.json