readd toolbelt

stilnat · Nov 23, 2023 · 4e4826e · 4e4826e
1 parent 193ce48
commit 4e4826e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Assets/Content/Addressables/AssetGroups/Items.asset b/Assets/Content/Addressables/AssetGroups/Items.asset
@@ -193,10 +193,6 @@ MonoBehaviour:
     m_Address: Assets/Content/WorldObjects/Items/Clothes/HeadsetRight.prefab
     m_ReadOnly: 0
     m_SerializedLabels: []
-<<<<<<< Updated upstream
-  - m_GUID: 8fabaf8ecfcd66a43a5b3fe2cefea719
-    m_Address: Assets/Content/WorldObjects/Items/Functional/Storage/Objects/Toolbelt.prefab
-=======
   - m_GUID: 06b6be83779804245b7f6411fe07b851
     m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanArmLeft.prefab
     m_ReadOnly: 0
@@ -275,7 +271,10 @@ MonoBehaviour:
     m_SerializedLabels: []
   - m_GUID: 7579883b8dd8801448a176adace4860b
     m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanBrain.prefab
->>>>>>> Stashed changes
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 8fabaf8ecfcd66a43a5b3fe2cefea719
+    m_Address: Assets/Content/WorldObjects/Items/Functional/Storage/Objects/Toolbelt.prefab
     m_ReadOnly: 0
     m_SerializedLabels: []
   m_ReadOnly: 0

diff --git a/Assets/Content/Data/Items.asset b/Assets/Content/Data/Items.asset
@@ -80,3 +80,4 @@ MonoBehaviour:
   - {fileID: 5774385816057912484, guid: 1e304f9a331c2ba419514ef8afb8a13c, type: 3}
   - {fileID: 5774385816057912484, guid: 071581df025e1ba49a8a75eb39611ff6, type: 3}
   - {fileID: 5774385816057912484, guid: 7579883b8dd8801448a176adace4860b, type: 3}
+  - {fileID: 1080889307602868191, guid: 8fabaf8ecfcd66a43a5b3fe2cefea719, type: 3}
diff --git a/Assets/Scripts/SS3D/Data/Enums/ItemId.cs b/Assets/Scripts/SS3D/Data/Enums/ItemId.cs
@@ -1,4 +1,4 @@
-namespace SS3D.Data.Enums
+namespace SS3D.Data.Enums
 {
     public enum ItemId
     {
@@ -66,6 +66,7 @@ public enum ItemId
         HumanIntestineLarge = 61, 
         HumanEye = 62, 
         HumanBrain = 63, 
+        Toolbelt = 64, 
     }
 }