Add Fixture State Component to Objects (#599)

* Add fixture state maintainer to most furnitures and some structures too * Move solar panels from pipe layer to furniture layer * fix few prefabs * Add fixture state component to missed poster * Update map with new furniture rotations * Add plants to botany * Fixed incorrect material names and removed copied materials * Fix rotations again after conflicted files
RE-SS3D · Jan 29, 2021 · b6b2a20 · b6b2a20
1 parent cbbd520
commit b6b2a20
Show file tree

Hide file tree

Showing 83 changed files with 52,989 additions and 44,430 deletions.
diff --git a/Assets/Art/Models/Furniture/Machines/Botany/Biogenerator.fbx.meta b/Assets/Art/Models/Furniture/Machines/Botany/Biogenerator.fbx.meta
diff --git a/Assets/Art/Models/Furniture/Machines/Generic/Computer.fbx.meta b/Assets/Art/Models/Furniture/Machines/Generic/Computer.fbx.meta
diff --git a/Assets/Art/Models/Furniture/Storage/janitorial cart.fbx b/Assets/Art/Models/Furniture/Storage/janitorial cart.fbx
diff --git a/Assets/Art/Models/Items/Functional/Containers/Liquid/Beakers.fbx.meta b/Assets/Art/Models/Items/Functional/Containers/Liquid/Beakers.fbx.meta
diff --git a/...ctional/Tools/Custodial/space cleaner.fbx → ...ional/Containers/Liquid/space cleaner.fbx b/...ctional/Tools/Custodial/space cleaner.fbx → ...ional/Containers/Liquid/space cleaner.fbx
diff --git a/...al/Tools/Custodial/space cleaner.fbx.meta → .../Containers/Liquid/space cleaner.fbx.meta b/...al/Tools/Custodial/space cleaner.fbx.meta → .../Containers/Liquid/space cleaner.fbx.meta
diff --git a/Assets/Art/Models/Items/Weapons/Explosive/rocket.fbx.meta b/Assets/Art/Models/Items/Weapons/Explosive/rocket.fbx.meta
diff --git a/Assets/Art/Models/Structures/Floors/Dirt.fbx b/Assets/Art/Models/Structures/Floors/Dirt.fbx
diff --git a/Assets/Art/Models/Structures/Floors/Dirt.fbx.meta b/Assets/Art/Models/Structures/Floors/Dirt.fbx.meta
diff --git a/Assets/Art/Models/Structures/Floors/Grass.fbx.meta b/Assets/Art/Models/Structures/Floors/Grass.fbx.meta
diff --git a/Assets/Content/Furniture/Generic/Jukebox.prefab b/Assets/Content/Furniture/Generic/Jukebox.prefab
@@ -17,6 +17,7 @@ GameObject:
   - component: {fileID: 3282234824440748568}
   - component: {fileID: 2780048927197938333}
   - component: {fileID: 6944020250224238214}
+  - component: {fileID: -6616646715259926527}
   m_Layer: 0
   m_Name: Jukebox
   m_TagString: Untagged
@@ -277,3 +278,17 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!114 &-6616646715259926527
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4170175011264555292}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca62035673670df44b63025dcc079a25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tileState:
+    rotation: 0
diff --git a/Assets/Content/Furniture/Generic/Mop Bucket.prefab b/Assets/Content/Furniture/Generic/Mop Bucket.prefab
@@ -59,7 +59,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 963665549342937872}
-  m_Mesh: {fileID: 5609219081243222174, guid: 46862153b3b146c43b565ba6152e52d4, type: 3}
+  m_Mesh: {fileID: 5609219081243222174, guid: 023800698472e2743b9d228f0b0f524f, type: 3}
 --- !u!23 &4951297878696369990
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -112,7 +112,7 @@ MeshCollider:
   serializedVersion: 4
   m_Convex: 1
   m_CookingOptions: 30
-  m_Mesh: {fileID: 5609219081243222174, guid: 46862153b3b146c43b565ba6152e52d4, type: 3}
+  m_Mesh: {fileID: 5609219081243222174, guid: 023800698472e2743b9d228f0b0f524f, type: 3}
 --- !u!114 &-3120317585915594544
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Assets/Content/Furniture/Generic/Seats/Stool.prefab b/Assets/Content/Furniture/Generic/Seats/Stool.prefab
@@ -15,6 +15,7 @@ GameObject:
   - component: {fileID: -5712762706414865343}
   - component: {fileID: 2959517125897960550}
   - component: {fileID: -4507827649618911346}
+  - component: {fileID: -2405281094997076438}
   m_Layer: 0
   m_Name: Stool
   m_TagString: Untagged
@@ -146,3 +147,17 @@ MonoBehaviour:
   DisplayName: Stool
   Text: 
   MaxDistance: 0
+--- !u!114 &-2405281094997076438
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848695623778231642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca62035673670df44b63025dcc079a25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tileState:
+    rotation: 0
diff --git a/Assets/Content/Furniture/Generic/Seats/Toilet/Toilet.prefab b/Assets/Content/Furniture/Generic/Seats/Toilet/Toilet.prefab
@@ -96,6 +96,7 @@ GameObject:
   - component: {fileID: 4736502494625233072}
   - component: {fileID: 6410542327681874041}
   - component: {fileID: 5281519465761832601}
+  - component: {fileID: -3453679615323309297}
   m_Layer: 0
   m_Name: Toilet
   m_TagString: Untagged
@@ -229,6 +230,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   HideItems: 1
   AttachItems: 1
+  AttachmentOffset: {x: 0, y: 0, z: 0}
 --- !u!114 &5281519465761832601
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -243,6 +245,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   AttachedContainer: {fileID: 6410542327681874041}
   Size: {x: 2, y: 2}
+--- !u!114 &-3453679615323309297
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5161561551087789900}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca62035673670df44b63025dcc079a25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tileState:
+    rotation: 0
 --- !u!1 &5218468364695561986
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Content/Furniture/Generic/Sink.prefab b/Assets/Content/Furniture/Generic/Sink.prefab
@@ -15,6 +15,7 @@ GameObject:
   - component: {fileID: 7518424092208512007}
   - component: {fileID: 4318521627488898313}
   - component: {fileID: 3282234824440748568}
+  - component: {fileID: 4437022230373823828}
   m_Layer: 0
   m_Name: Sink
   m_TagString: Untagged
@@ -143,6 +144,20 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 671f779259184f2c984b9c017a5141df, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DisplayName: 
-  Text: <b></b>
+  DisplayName: Sink
+  Text: 
   MaxDistance: 0
+--- !u!114 &4437022230373823828
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4170175011264555292}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca62035673670df44b63025dcc079a25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tileState:
+    rotation: 0
diff --git a/Assets/Content/Furniture/Machines/Atmospherics/Disposal Bin/Disposal Bin.prefab b/Assets/Content/Furniture/Machines/Atmospherics/Disposal Bin/Disposal Bin.prefab
@@ -20,6 +20,7 @@ GameObject:
   - component: {fileID: 8037963738998773868}
   - component: {fileID: 7515595592165819411}
   - component: {fileID: 4430263281735885129}
+  - component: {fileID: -9016706916229720168}
   m_Layer: 0
   m_Name: Disposal Bin
   m_TagString: Untagged
@@ -296,6 +297,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   HideItems: 1
   AttachItems: 1
+  AttachmentOffset: {x: 0, y: 0, z: 0}
 --- !u!114 &7515595592165819411
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -324,6 +326,20 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   syncMode: 0
   syncInterval: 0.1
+--- !u!114 &-9016706916229720168
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6905024007199924851}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca62035673670df44b63025dcc079a25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tileState:
+    rotation: 0
 --- !u!1 &7531797193249841566
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Content/Furniture/Machines/Atmospherics/Tank Storage Unit.prefab b/Assets/Content/Furniture/Machines/Atmospherics/Tank Storage Unit.prefab
@@ -126,6 +126,7 @@ GameObject:
   - component: {fileID: 2928619056195421076}
   - component: {fileID: 6947381346998146940}
   - component: {fileID: 3959135070748397564}
+  - component: {fileID: 1866690735240689045}
   m_Layer: 0
   m_Name: Tank Storage Unit
   m_TagString: Untagged
@@ -275,3 +276,17 @@ MonoBehaviour:
   DisplayName: Tank Storage Unit
   Text: 
   MaxDistance: 0
+--- !u!114 &1866690735240689045
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7348721911392627679}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca62035673670df44b63025dcc079a25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tileState:
+    rotation: 0
diff --git a/Assets/Content/Furniture/Machines/Botany/Biogenerator.prefab b/Assets/Content/Furniture/Machines/Botany/Biogenerator.prefab
@@ -46,6 +46,7 @@ GameObject:
   - component: {fileID: -774126658597833377}
   - component: {fileID: -9091612087525422286}
   - component: {fileID: 7848135095644858374}
+  - component: {fileID: -4768826254171661378}
   m_Layer: 0
   m_Name: Biogenerator
   m_TagString: Untagged
@@ -60,7 +61,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1769453492926099347}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -95,7 +96,7 @@ MeshRenderer:
   m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: 7b91bd4845c08c04f96e3a5f5c47aeca, type: 2}
-  - {fileID: 2100000, guid: a4136159677bfb546846ebe3f0e64d9c, type: 2}
+  - {fileID: 2100000, guid: 0dfcd2fea1adf10409cb067ed40da41b, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -178,6 +179,20 @@ MonoBehaviour:
   DisplayName: Biogenerator
   Text: 
   MaxDistance: 0
+--- !u!114 &-4768826254171661378
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1769453492926099347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca62035673670df44b63025dcc079a25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tileState:
+    rotation: 0
 --- !u!1001 &308137637121226383
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/Assets/Content/Furniture/Machines/Botany/Dirt Mound.prefab b/Assets/Content/Furniture/Machines/Botany/Dirt Mound.prefab
@@ -15,6 +15,7 @@ GameObject:
   - component: {fileID: -774126658597833377}
   - component: {fileID: -9091612087525422286}
   - component: {fileID: 7848135095644858374}
+  - component: {fileID: -2500655928551917383}
   m_Layer: 0
   m_Name: Dirt Mound
   m_TagString: Untagged
@@ -29,7 +30,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1769453492926099347}
-  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
@@ -145,3 +146,17 @@ MonoBehaviour:
   DisplayName: Dirt Mound
   Text: 
   MaxDistance: 0
+--- !u!114 &-2500655928551917383
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1769453492926099347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca62035673670df44b63025dcc079a25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tileState:
+    rotation: 0