RE-SS3D · TaylorNAlbarnaz · Jan 17, 2023 · Jan 8, 2023 · Jan 15, 2023 · Jan 15, 2023
diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml
@@ -0,0 +1,16 @@
+<linker>
+  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Sprite" preserve="all" />
+    <type fullname="UnityEngine.Texture2D" preserve="all" />
+  </assembly>
+</linker>
diff --git a/...tems/Generic/ToolBoxes/Toolbox.asset.meta → Assets/AddressableAssetsData/link.xml.meta b/...tems/Generic/ToolBoxes/Toolbox.asset.meta → Assets/AddressableAssetsData/link.xml.meta
diff --git a/Assets/Content/Data/DefaultPrefabObjects.asset b/Assets/Content/Data/DefaultPrefabObjects.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultPrefabObjects
   m_EditorClassIdentifier: 
   _prefabs:
+  - {fileID: 562230263738288595, guid: 06a27ffa07c1c754c9590607a5a80030, type: 3}
   - {fileID: 562230263738288595, guid: 59f05e8a3a1d4b94eb5222aed605e260, type: 3}
   - {fileID: 8203177977882359099, guid: 6ab4ce7059d374a4498481e1385c222e, type: 3}
   - {fileID: 1871071288925904272, guid: add4d1bc2d874d94782d6b8c912af5e2, type: 3}
@@ -27,4 +28,5 @@ MonoBehaviour:
   - {fileID: 1019513474262773944, guid: 06c946c7c639138488b814e4448b82e4, type: 3}
   - {fileID: 4819234911439508660, guid: 11f824c472e04854e95065dda095e8f4, type: 3}
   - {fileID: 4819234911439508660, guid: 1ae18785d74e9fa4699b6f6de889c243, type: 3}
+  - {fileID: 3258417366846669140, guid: 264ea51d92067c14ebc6633999afac78, type: 3}
   - {fileID: 3206407796921847736, guid: 3335d001fdfff824aa859b98f2fe564e, type: 3}
diff --git a/Assets/Content/Entities/Human/Human_Temporary.prefab b/Assets/Content/Entities/Human/Human_Temporary.prefab
@@ -3033,7 +3033,7 @@ MonoBehaviour:
   _isGlobal: 0
   _defaultDespawnType: 0
   NetworkObserver: {fileID: 0}
-  <PrefabId>k__BackingField: 2
+  <PrefabId>k__BackingField: 3
   _scenePathHash: 0
   <SceneId>k__BackingField: 0
   <AssetPathHash>k__BackingField: 3682879707339158369
@@ -3155,11 +3155,11 @@ MonoBehaviour:
   _addedNetworkObject: {fileID: 2930813178971533500}
   _networkObjectCache: {fileID: 2930813178971533500}
   _characterController: {fileID: 3812744165389046210}
-  _playerControllable: {fileID: 8336170331735268562}
-  _staminaController: {fileID: 6791200117061487242}
+  _entity: {fileID: 8336170331735268562}
   _movementSpeed: 5
   _lerpMultiplier: 2
   _rotationLerpMultiplier: 6
+  _staminaController: {fileID: 6791200117061487242}
   _movementTarget: {fileID: 282733360052666326}
 --- !u!114 &6706577840954258383
 MonoBehaviour:
@@ -3191,7 +3191,7 @@ MonoBehaviour:
   _componentIndexCache: 3
   _addedNetworkObject: {fileID: 2930813178971533500}
   _networkObjectCache: {fileID: 2930813178971533500}
-  _controllingSoul: {fileID: 0}
+  _mind: {fileID: 0}
 --- !u!114 &5293420320943344825
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3267,7 +3267,7 @@ MonoBehaviour:
   _addedNetworkObject: {fileID: 2930813178971533500}
   _networkObjectCache: {fileID: 2930813178971533500}
   _player: {fileID: 1872721284991216642}
-  playerControllable: {fileID: 8336170331735268562}
+  _entity: {fileID: 8336170331735268562}
 --- !u!1 &6530700040387722453
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Content/Entities/Mind.prefab b/Assets/Content/Entities/Mind.prefab
@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8103066686919155798
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4873977336851923621}
+  - component: {fileID: 562230263738288595}
+  - component: {fileID: 3486636391395698902}
+  - component: {fileID: 3363661164123955675}
+  - component: {fileID: 1256239026443271520}
+  m_Layer: 0
+  m_Name: Mind
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4873977336851923621
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8103066686919155798}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &562230263738288595
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8103066686919155798}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  <IsNested>k__BackingField: 0
+  <ComponentIndex>k__BackingField: 0
+  _networkBehaviours:
+  - {fileID: 0}
+  - {fileID: 3486636391395698902}
+  <ParentNetworkObject>k__BackingField: {fileID: 0}
+  <ChildNetworkObjects>k__BackingField: []
+  _isNetworked: 1
+  _isGlobal: 0
+  _defaultDespawnType: 0
+  NetworkObserver: {fileID: 0}
+  <PrefabId>k__BackingField: -1
+  _scenePathHash: 0
+  <SceneId>k__BackingField: 0
+  <AssetPathHash>k__BackingField: 17065920712306154591
+  _sceneNetworkObjects: []
+--- !u!114 &3486636391395698902
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8103066686919155798}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _componentIndexCache: 1
+  _addedNetworkObject: {fileID: 562230263738288595}
+  _networkObjectCache: {fileID: 562230263738288595}
+  _synchronizeParent: 0
+  _packing:
+    Position: 1
+    Rotation: 1
+    Scale: 0
+  _interpolation: 2
+  _extrapolation: 2
+  _enableTeleport: 0
+  _teleportThreshold: 1
+  _clientAuthoritative: 1
+  _sendToOwner: 1
+  _interval: 1
+  _synchronizePosition: 1
+  _positionSnapping:
+    X: 0
+    Y: 0
+    Z: 0
+  _synchronizeRotation: 1
+  _rotationSnapping:
+    X: 0
+    Y: 0
+    Z: 0
+  _synchronizeScale: 1
+  _scaleSnapping:
+    X: 0
+    Y: 0
+    Z: 0
+--- !u!114 &3363661164123955675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8103066686919155798}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7d331f979d46e8e4a9fc90070c596d44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _updateHostVisibility: 1
+  _defaultConditions:
+  - {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2}
+--- !u!114 &1256239026443271520
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8103066686919155798}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 29d089bc254643d3bbb0c93cdd6c0b82, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _componentIndexCache: 255
+  _addedNetworkObject: {fileID: 562230263738288595}
+  _networkObjectCache: {fileID: 0}
+  Soul: {fileID: 0}
diff --git a/Assets/Content/Entities/Mind.prefab.meta b/Assets/Content/Entities/Mind.prefab.meta
diff --git a/Assets/Content/Entities/Silicon/Engineer Borg/Engi Borg.prefab b/Assets/Content/Entities/Silicon/Engineer Borg/Engi Borg.prefab
@@ -1402,7 +1402,7 @@ MonoBehaviour:
   _isGlobal: 0
   _defaultDespawnType: 0
   NetworkObserver: {fileID: 0}
-  <PrefabId>k__BackingField: 9
+  <PrefabId>k__BackingField: 10
   _scenePathHash: 0
   <SceneId>k__BackingField: 0
   <AssetPathHash>k__BackingField: 9988794035435604749
@@ -1551,7 +1551,7 @@ MonoBehaviour:
   _addedNetworkObject: {fileID: 1019513474262773944}
   _networkObjectCache: {fileID: 1019513474262773944}
   _characterController: {fileID: 8159127053265572578}
-  _playerControllable: {fileID: 1234979698125959994}
+  _entity: {fileID: 1234979698125959994}
   _movementSpeed: 2
   _lerpMultiplier: 2
   _rotationLerpMultiplier: 8
@@ -1571,7 +1571,7 @@ MonoBehaviour:
   _componentIndexCache: 3
   _addedNetworkObject: {fileID: 1019513474262773944}
   _networkObjectCache: {fileID: 1019513474262773944}
-  _controllingSoul: {fileID: 0}
+  _mind: {fileID: 0}
 --- !u!1 &6250850031364791032
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Content/Items/Generic/ToolBoxes/Toolbox.asset b/Assets/Content/Items/Generic/ToolBoxes/Toolbox.asset
diff --git a/...Items/Generic/ToolBoxes/RedToolbox.prefab → ...tems/Generic/ToolBoxes/ToolboxBlue.prefab b/...Items/Generic/ToolBoxes/RedToolbox.prefab → ...tems/Generic/ToolBoxes/ToolboxBlue.prefab
@@ -93,7 +93,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: e6b9b44320f4448d9d5e0ee634259966, type: 2}
+  - {fileID: 2100000, guid: 695c4de41b9578049a93f19b1eef7213, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -190,7 +190,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 22262639920f43d6be32430e4e58350d, type: 2}
+  - {fileID: 2100000, guid: 695c4de41b9578049a93f19b1eef7213, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -245,7 +245,7 @@ GameObject:
   - component: {fileID: 5747472693690594541}
   - component: {fileID: 1094090079819989120}
   m_Layer: 10
-  m_Name: RedToolbox
+  m_Name: ToolboxBlue
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -311,9 +311,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b8e907cf58c0ce0439d34cd7cf644216, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _componentIndexCache: 255
+  _componentIndexCache: 0
   _addedNetworkObject: {fileID: 3258417366846669140}
-  _networkObjectCache: {fileID: 0}
+  _networkObjectCache: {fileID: 3258417366846669140}
   _itemId: 
   _name: 
   _sprite: {fileID: 0}
@@ -355,9 +355,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _componentIndexCache: 255
+  _componentIndexCache: 1
   _addedNetworkObject: {fileID: 3258417366846669140}
-  _networkObjectCache: {fileID: 0}
+  _networkObjectCache: {fileID: 3258417366846669140}
   _synchronizeParent: 0
   _packing:
     Position: 1
@@ -399,7 +399,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   <IsNested>k__BackingField: 0
   <ComponentIndex>k__BackingField: 0
-  _networkBehaviours: []
+  _networkBehaviours:
+  - {fileID: 2884915648782529247}
+  - {fileID: 3298710121668139635}
+  - {fileID: 7082293104205752709}
+  - {fileID: 5747472693690594541}
+  - {fileID: 1094090079819989120}
   <ParentNetworkObject>k__BackingField: {fileID: 0}
   <ChildNetworkObjects>k__BackingField: []
   _isNetworked: 1
@@ -409,7 +414,7 @@ MonoBehaviour:
   <PrefabId>k__BackingField: -1
   _scenePathHash: 0
   <SceneId>k__BackingField: 0
-  <AssetPathHash>k__BackingField: 2804125510250307982
+  <AssetPathHash>k__BackingField: 4937251580671274826
   _sceneNetworkObjects: []
 --- !u!114 &9136074542965640709
 MonoBehaviour:
@@ -449,6 +454,8 @@ MonoBehaviour:
   HasCustomDisplay: 0
   Displays: []
   NumberDisplay: 0
+  StartFilter: {fileID: 0}
+  Type: -1
 --- !u!114 &7082293104205752709
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -461,9 +468,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cf2e1e93bb2b4f2eac8df7a07b518352, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _componentIndexCache: 255
+  _componentIndexCache: 2
   _addedNetworkObject: {fileID: 3258417366846669140}
-  _networkObjectCache: {fileID: 0}
+  _networkObjectCache: {fileID: 3258417366846669140}
   Size: {x: 10, y: 10}
 --- !u!114 &5747472693690594541
 MonoBehaviour:
@@ -477,9 +484,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 72bfc9c5e18140bc9dbf232d3a7c2ff6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _componentIndexCache: 255
+  _componentIndexCache: 3
   _addedNetworkObject: {fileID: 3258417366846669140}
-  _networkObjectCache: {fileID: 0}
+  _networkObjectCache: {fileID: 3258417366846669140}
   ContainerDescriptor: {fileID: 9136074542965640709}
   _container: {fileID: 7082293104205752709}
 --- !u!114 &1094090079819989120
@@ -494,10 +501,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3c75d17834848bb4f83ee6e730a65519, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _componentIndexCache: 255
+  _componentIndexCache: 4
   _addedNetworkObject: {fileID: 3258417366846669140}
-  _networkObjectCache: {fileID: 0}
-  OpenIcon: {fileID: 0}
+  _networkObjectCache: {fileID: 3258417366846669140}
+  OverrideOpenIcon: {fileID: 0}
   containerDescriptor: {fileID: 9136074542965640709}
 --- !u!1 &8066562249021099569
 GameObject:

diff --git a/.../Generic/ToolBoxes/RedToolbox.prefab.meta → ...Generic/ToolBoxes/ToolboxBlue.prefab.meta b/.../Generic/ToolBoxes/RedToolbox.prefab.meta → ...Generic/ToolBoxes/ToolboxBlue.prefab.meta