From 2bca17b81d7fc5b79ad597ded34343714b6719c4 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:13:25 -0500 Subject: [PATCH 01/54] Simplify asset management workflow by removing unnecessary type parameters in asset creation methods, and removing DatabaseAsset.cs usage. --- .../Creators/DatabaseAssetCreator.cs | 5 +- .../Writers/DatabaseAssetWriter.cs | 12 +- .../SS3D/Data/AssetDatabases/AssetDatabase.cs | 2 +- .../AssetDatabases/AssetDatabaseSettings.cs | 3 +- .../SS3D/Data/Generated/AssetDatabases.cs | 17 +- .../SS3D/Data/Generated/CraftingRecipes.cs | 14 +- .../SS3D/Data/Generated/InteractionIcons.cs | 14 +- Assets/Scripts/SS3D/Data/Generated/Items.cs | 186 +++++++++--------- .../Scripts/SS3D/Data/Generated/Materials.cs | 8 +- .../SS3D/Data/Generated/ParticlesEffects.cs | 8 +- Assets/Scripts/SS3D/Data/Generated/Sounds.cs | 24 ++- .../SS3D/Data/Generated/WorldSpaceUI.cs | 4 +- 12 files changed, 137 insertions(+), 160 deletions(-) diff --git a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs index 38a16f8b27..620fff1e12 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs @@ -1,5 +1,4 @@ using JetBrains.Annotations; -using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -15,7 +14,7 @@ public static class DatabaseAssetCreator /// /// Creates a list of database assets in the object path, with the defined class name and using a list of provided assets as its elements. /// - public static void CreateAtPath(string path, Type classType, string className, [NotNull] IEnumerable assets, string namespaceName = "SS3D.Data.Generated") + public static void CreateAtPath(string path, string className, [NotNull] IEnumerable assets, string namespaceName = "SS3D.Data.Generated") { IEnumerable enums = assets.Select(reference => reference.name); @@ -27,7 +26,7 @@ public static void CreateAtPath(string path, Type classType, string className, [ Directory.CreateDirectory(fullPath); } - DatabaseAssetWriter.Write(fullPath, classType, className, enums, namespaceName); + DatabaseAssetWriter.Write(fullPath, className, enums, namespaceName); if (EditorWindow.focusedWindow != null) { diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs index 9620dde6e9..74ffe4a7a6 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs @@ -1,29 +1,25 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; namespace SS3D.CodeGeneration { - public class DatabaseAssetWriter + public static class DatabaseAssetWriter { /// /// Writes a static class of a DatabaseAssets from an AssetDatabase. /// /// Where to write this file to. - /// The type of the field elements to use, mainly because assembly conflicts. /// The name of the class, currently being the asset database name /// the elements to add to this class /// the namespace name to use - public static void Write(string filePath, Type classType, string className, IEnumerable items, string namespaceName = "SS3D.Data.Enums") + public static void Write(string filePath, string className, IEnumerable items, string namespaceName = "SS3D.Data.Enums") { IEnumerable filtered = items.GroupBy(name => name).Select(nameGroup => nameGroup.Key); SourceFile sourceFile = new(); - sourceFile.AppendLine($"using {classType.Namespace}\n;"); - using (new NamespaceScope(sourceFile, namespaceName)) { sourceFile.AppendLine($"// This class is autogenerated. Do not modify manually."); @@ -46,7 +42,7 @@ public static void Write(string filePath, Type classType, string className, IEnu StringBuilder stringBuilder = new(); stringBuilder.Append(corrected); - sourceFile.AppendLine($"public static {classType.Name} {stringBuilder} = new {classType.Name}(\"{stringBuilder}\", \"{className}\");"); } + sourceFile.AppendLine($"public const string {stringBuilder} = \"{stringBuilder}\";"); } } } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs index f559bed545..aed793c552 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs @@ -144,7 +144,7 @@ public void GenerateDatabaseCode() return; } - DatabaseAssetCreator.CreateAtPath(DatabaseAssetPath, typeof(DatabaseAsset), DatabaseName, Assets.Values, DatabaseAssetNamespaceName); + DatabaseAssetCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values, DatabaseAssetNamespaceName); } #endif } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs index 963d091d95..9ffd513be4 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Coimbra; using SS3D.Attributes; -using SS3D.CodeGeneration; using SS3D.CodeGeneration.Creators; using UnityEngine; @@ -41,7 +40,7 @@ public void CreateDatabaseCode() const string dataPath = AssetDatabase.DatabaseAssetPath; - DatabaseAssetCreator.CreateAtPath(dataPath, typeof(DatabaseAsset), "AssetDatabases", IncludedAssetDatabases); + DatabaseAssetCreator.CreateAtPath(dataPath, "AssetDatabases", IncludedAssetDatabases); } #endif } diff --git a/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs b/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs index a0bb669e4b..10207e4a1d 100644 --- a/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs +++ b/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs @@ -1,18 +1,15 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class AssetDatabases { - public static DatabaseAsset CraftingRecipes = new DatabaseAsset("CraftingRecipes", "AssetDatabases"); - public static DatabaseAsset InteractionIcons = new DatabaseAsset("InteractionIcons", "AssetDatabases"); - public static DatabaseAsset Items = new DatabaseAsset("Items", "AssetDatabases"); - public static DatabaseAsset Materials = new DatabaseAsset("Materials", "AssetDatabases"); - public static DatabaseAsset ParticlesEffects = new DatabaseAsset("ParticlesEffects", "AssetDatabases"); - public static DatabaseAsset Scenes = new DatabaseAsset("Scenes", "AssetDatabases"); - public static DatabaseAsset Sounds = new DatabaseAsset("Sounds", "AssetDatabases"); - public static DatabaseAsset WorldSpaceUI = new DatabaseAsset("WorldSpaceUI", "AssetDatabases"); + public const string CraftingRecipes = "CraftingRecipes"; + public const string InteractionIcons = "InteractionIcons"; + public const string Items = "Items"; + public const string Materials = "Materials"; + public const string ParticlesEffects = "ParticlesEffects"; + public const string Sounds = "Sounds"; + public const string WorldSpaceUI = "WorldSpaceUI"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs b/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs index 8862aaaf6d..9b463ea206 100644 --- a/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs +++ b/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs @@ -1,16 +1,14 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class CraftingRecipes { - public static DatabaseAsset WeirdComplexRecipe = new DatabaseAsset("WeirdComplexRecipe", "CraftingRecipes"); - public static DatabaseAsset SteelGirderUnboltedRecipe = new DatabaseAsset("SteelGirderUnboltedRecipe", "CraftingRecipes"); - public static DatabaseAsset SteelSheetRecipe = new DatabaseAsset("SteelSheetRecipe", "CraftingRecipes"); - public static DatabaseAsset ReinforcedWallRecipe = new DatabaseAsset("ReinforcedWallRecipe", "CraftingRecipes"); - public static DatabaseAsset SteelWallRecipe = new DatabaseAsset("SteelWallRecipe", "CraftingRecipes"); - public static DatabaseAsset SteelGirderRecipe = new DatabaseAsset("SteelGirderRecipe", "CraftingRecipes"); + public const string WeirdComplexRecipe = "WeirdComplexRecipe"; + public const string SteelGirderUnboltedRecipe = "SteelGirderUnboltedRecipe"; + public const string SteelSheetRecipe = "SteelSheetRecipe"; + public const string ReinforcedWallRecipe = "ReinforcedWallRecipe"; + public const string SteelWallRecipe = "SteelWallRecipe"; + public const string SteelGirderRecipe = "SteelGirderRecipe"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs b/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs index a937e0c016..4ccbabfb44 100644 --- a/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs +++ b/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs @@ -1,16 +1,14 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class InteractionIcons { - public static DatabaseAsset Power = new DatabaseAsset("Power", "InteractionIcons"); - public static DatabaseAsset Take = new DatabaseAsset("Take", "InteractionIcons"); - public static DatabaseAsset Open = new DatabaseAsset("Open", "InteractionIcons"); - public static DatabaseAsset Discard = new DatabaseAsset("Discard", "InteractionIcons"); - public static DatabaseAsset Honk = new DatabaseAsset("Honk", "InteractionIcons"); - public static DatabaseAsset Nuke = new DatabaseAsset("Nuke", "InteractionIcons"); + public const string Power = "Power"; + public const string Take = "Take"; + public const string Open = "Open"; + public const string Discard = "Discard"; + public const string Honk = "Honk"; + public const string Nuke = "Nuke"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Items.cs b/Assets/Scripts/SS3D/Data/Generated/Items.cs index d77d6d9105..e86339775e 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Items.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Items.cs @@ -1,102 +1,100 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class Items { - public static DatabaseAsset BikeHorn = new DatabaseAsset("BikeHorn", "Items"); - public static DatabaseAsset NuclearAuthenticationDisk = new DatabaseAsset("NuclearAuthenticationDisk", "Items"); - public static DatabaseAsset ToolboxBlue = new DatabaseAsset("ToolboxBlue", "Items"); - public static DatabaseAsset SecurityPDA = new DatabaseAsset("SecurityPDA", "Items"); - public static DatabaseAsset SecurityIDCard = new DatabaseAsset("SecurityIDCard", "Items"); - public static DatabaseAsset PDA = new DatabaseAsset("PDA", "Items"); - public static DatabaseAsset IDCard = new DatabaseAsset("IDCard", "Items"); - public static DatabaseAsset Mug = new DatabaseAsset("Mug", "Items"); - public static DatabaseAsset SodaCanCola = new DatabaseAsset("SodaCanCola", "Items"); - public static DatabaseAsset SodaCanCannedLaughter = new DatabaseAsset("SodaCanCannedLaughter", "Items"); - public static DatabaseAsset SodaCanCannedAir = new DatabaseAsset("SodaCanCannedAir", "Items"); - public static DatabaseAsset SodaCanTonic = new DatabaseAsset("SodaCanTonic", "Items"); - public static DatabaseAsset SodaCanBeepyLime = new DatabaseAsset("SodaCanBeepyLime", "Items"); - public static DatabaseAsset SodaCanBeepsSoda = new DatabaseAsset("SodaCanBeepsSoda", "Items"); - public static DatabaseAsset SodaCanDukePurpleTea = new DatabaseAsset("SodaCanDukePurpleTea", "Items"); - public static DatabaseAsset Poster = new DatabaseAsset("Poster", "Items"); - public static DatabaseAsset MedicalPatch = new DatabaseAsset("MedicalPatch", "Items"); - public static DatabaseAsset BrutePatch = new DatabaseAsset("BrutePatch", "Items"); - public static DatabaseAsset BurnPatch = new DatabaseAsset("BurnPatch", "Items"); - public static DatabaseAsset DonkPocket = new DatabaseAsset("DonkPocket", "Items"); - public static DatabaseAsset Boombox = new DatabaseAsset("Boombox", "Items"); - public static DatabaseAsset FloorTile = new DatabaseAsset("FloorTile", "Items"); - public static DatabaseAsset SteelReinforcedSheet = new DatabaseAsset("SteelReinforcedSheet", "Items"); - public static DatabaseAsset SteelSheet = new DatabaseAsset("SteelSheet", "Items"); - public static DatabaseAsset Crowbar = new DatabaseAsset("Crowbar", "Items"); - public static DatabaseAsset ScrewdriverBlue = new DatabaseAsset("ScrewdriverBlue", "Items"); - public static DatabaseAsset Wrench = new DatabaseAsset("Wrench", "Items"); - public static DatabaseAsset FlashlightBlue = new DatabaseAsset("FlashlightBlue", "Items"); - public static DatabaseAsset KitchenKnife = new DatabaseAsset("KitchenKnife", "Items"); - public static DatabaseAsset TruckerCap = new DatabaseAsset("TruckerCap", "Items"); - public static DatabaseAsset Sunglasses = new DatabaseAsset("Sunglasses", "Items"); - public static DatabaseAsset FacewearGasMask = new DatabaseAsset("FacewearGasMask", "Items"); - public static DatabaseAsset HumanArmLeft = new DatabaseAsset("HumanArmLeft", "Items"); - public static DatabaseAsset HumanArmRight = new DatabaseAsset("HumanArmRight", "Items"); - public static DatabaseAsset HumanEarLeft = new DatabaseAsset("HumanEarLeft", "Items"); - public static DatabaseAsset HumanEarRight = new DatabaseAsset("HumanEarRight", "Items"); - public static DatabaseAsset HumanFootLeft = new DatabaseAsset("HumanFootLeft", "Items"); - public static DatabaseAsset HumanFootRight = new DatabaseAsset("HumanFootRight", "Items"); - public static DatabaseAsset HumanHandLeft = new DatabaseAsset("HumanHandLeft", "Items"); - public static DatabaseAsset HumanHandRight = new DatabaseAsset("HumanHandRight", "Items"); - public static DatabaseAsset HumanHead = new DatabaseAsset("HumanHead", "Items"); - public static DatabaseAsset HumanLegLeft = new DatabaseAsset("HumanLegLeft", "Items"); - public static DatabaseAsset HumanTorso = new DatabaseAsset("HumanTorso", "Items"); - public static DatabaseAsset HumanLegRight = new DatabaseAsset("HumanLegRight", "Items"); - public static DatabaseAsset HumanLungRight = new DatabaseAsset("HumanLungRight", "Items"); - public static DatabaseAsset HumanLungLeft = new DatabaseAsset("HumanLungLeft", "Items"); - public static DatabaseAsset HumanStomach = new DatabaseAsset("HumanStomach", "Items"); - public static DatabaseAsset HumanLiver = new DatabaseAsset("HumanLiver", "Items"); - public static DatabaseAsset HumanIntestineLarge = new DatabaseAsset("HumanIntestineLarge", "Items"); - public static DatabaseAsset HumanEye = new DatabaseAsset("HumanEye", "Items"); - public static DatabaseAsset HumanBrain = new DatabaseAsset("HumanBrain", "Items"); - public static DatabaseAsset Toolbelt = new DatabaseAsset("Toolbelt", "Items"); - public static DatabaseAsset Backpack = new DatabaseAsset("Backpack", "Items"); - public static DatabaseAsset HumanHeart = new DatabaseAsset("HumanHeart", "Items"); - public static DatabaseAsset Doodad = new DatabaseAsset("Doodad", "Items"); - public static DatabaseAsset Wirecutters = new DatabaseAsset("Wirecutters", "Items"); - public static DatabaseAsset Multitool = new DatabaseAsset("Multitool", "Items"); - public static DatabaseAsset PowerCellAdmin = new DatabaseAsset("PowerCellAdmin", "Items"); - public static DatabaseAsset PowerCell = new DatabaseAsset("PowerCell", "Items"); - public static DatabaseAsset SteelWall = new DatabaseAsset("SteelWall", "Items"); - public static DatabaseAsset SteelGirder = new DatabaseAsset("SteelGirder", "Items"); - public static DatabaseAsset Plenum = new DatabaseAsset("Plenum", "Items"); - public static DatabaseAsset SteelGirderUnbolted = new DatabaseAsset("SteelGirderUnbolted", "Items"); - public static DatabaseAsset GlassReinforcedSheet = new DatabaseAsset("GlassReinforcedSheet", "Items"); - public static DatabaseAsset GlassSheet = new DatabaseAsset("GlassSheet", "Items"); - public static DatabaseAsset WoodLog = new DatabaseAsset("WoodLog", "Items"); - public static DatabaseAsset WoodPlank = new DatabaseAsset("WoodPlank", "Items"); - public static DatabaseAsset SteelRod = new DatabaseAsset("SteelRod", "Items"); - public static DatabaseAsset Welder = new DatabaseAsset("Welder", "Items"); - public static DatabaseAsset PlasmaTank = new DatabaseAsset("PlasmaTank", "Items"); - public static DatabaseAsset OxygenTank = new DatabaseAsset("OxygenTank", "Items"); - public static DatabaseAsset JumpsuitGrey = new DatabaseAsset("JumpsuitGrey", "Items"); - public static DatabaseAsset JumpsuitSecurity = new DatabaseAsset("JumpsuitSecurity", "Items"); - public static DatabaseAsset JumpsuitBotany = new DatabaseAsset("JumpsuitBotany", "Items"); - public static DatabaseAsset HumanIntestineSmall = new DatabaseAsset("HumanIntestineSmall", "Items"); - public static DatabaseAsset GlassShard = new DatabaseAsset("GlassShard", "Items"); - public static DatabaseAsset JumpsuitEngineer = new DatabaseAsset("JumpsuitEngineer", "Items"); - public static DatabaseAsset MicroLaser = new DatabaseAsset("MicroLaser", "Items"); - public static DatabaseAsset MatterBin = new DatabaseAsset("MatterBin", "Items"); - public static DatabaseAsset Medkit = new DatabaseAsset("Medkit", "Items"); - public static DatabaseAsset HealthScanner = new DatabaseAsset("HealthScanner", "Items"); - public static DatabaseAsset Hatchet = new DatabaseAsset("Hatchet", "Items"); - public static DatabaseAsset ElectricalWire = new DatabaseAsset("ElectricalWire", "Items"); - public static DatabaseAsset ElectricalCable = new DatabaseAsset("ElectricalCable", "Items"); - public static DatabaseAsset SteelWindow = new DatabaseAsset("SteelWindow", "Items"); - public static DatabaseAsset SteelWallReinforced = new DatabaseAsset("SteelWallReinforced", "Items"); - public static DatabaseAsset SteelWindowReinforced = new DatabaseAsset("SteelWindowReinforced", "Items"); - public static DatabaseAsset HeadsetSecurity = new DatabaseAsset("HeadsetSecurity", "Items"); - public static DatabaseAsset Headset = new DatabaseAsset("Headset", "Items"); - public static DatabaseAsset GloveInsulated = new DatabaseAsset("GloveInsulated", "Items"); - public static DatabaseAsset ShoeHiTops = new DatabaseAsset("ShoeHiTops", "Items"); - public static DatabaseAsset ShoeJackboots = new DatabaseAsset("ShoeJackboots", "Items"); + public const string BikeHorn = "BikeHorn"; + public const string NuclearAuthenticationDisk = "NuclearAuthenticationDisk"; + public const string ToolboxBlue = "ToolboxBlue"; + public const string SecurityPDA = "SecurityPDA"; + public const string SecurityIDCard = "SecurityIDCard"; + public const string PDA = "PDA"; + public const string IDCard = "IDCard"; + public const string Mug = "Mug"; + public const string SodaCanCola = "SodaCanCola"; + public const string SodaCanCannedLaughter = "SodaCanCannedLaughter"; + public const string SodaCanCannedAir = "SodaCanCannedAir"; + public const string SodaCanTonic = "SodaCanTonic"; + public const string SodaCanBeepyLime = "SodaCanBeepyLime"; + public const string SodaCanBeepsSoda = "SodaCanBeepsSoda"; + public const string SodaCanDukePurpleTea = "SodaCanDukePurpleTea"; + public const string Poster = "Poster"; + public const string MedicalPatch = "MedicalPatch"; + public const string BrutePatch = "BrutePatch"; + public const string BurnPatch = "BurnPatch"; + public const string DonkPocket = "DonkPocket"; + public const string Boombox = "Boombox"; + public const string FloorTile = "FloorTile"; + public const string SteelReinforcedSheet = "SteelReinforcedSheet"; + public const string SteelSheet = "SteelSheet"; + public const string Crowbar = "Crowbar"; + public const string ScrewdriverBlue = "ScrewdriverBlue"; + public const string Wrench = "Wrench"; + public const string FlashlightBlue = "FlashlightBlue"; + public const string KitchenKnife = "KitchenKnife"; + public const string TruckerCap = "TruckerCap"; + public const string Sunglasses = "Sunglasses"; + public const string FacewearGasMask = "FacewearGasMask"; + public const string HumanArmLeft = "HumanArmLeft"; + public const string HumanArmRight = "HumanArmRight"; + public const string HumanEarLeft = "HumanEarLeft"; + public const string HumanEarRight = "HumanEarRight"; + public const string HumanFootLeft = "HumanFootLeft"; + public const string HumanFootRight = "HumanFootRight"; + public const string HumanHandLeft = "HumanHandLeft"; + public const string HumanHandRight = "HumanHandRight"; + public const string HumanHead = "HumanHead"; + public const string HumanLegLeft = "HumanLegLeft"; + public const string HumanTorso = "HumanTorso"; + public const string HumanLegRight = "HumanLegRight"; + public const string HumanLungRight = "HumanLungRight"; + public const string HumanLungLeft = "HumanLungLeft"; + public const string HumanStomach = "HumanStomach"; + public const string HumanLiver = "HumanLiver"; + public const string HumanIntestineLarge = "HumanIntestineLarge"; + public const string HumanEye = "HumanEye"; + public const string HumanBrain = "HumanBrain"; + public const string Toolbelt = "Toolbelt"; + public const string Backpack = "Backpack"; + public const string HumanHeart = "HumanHeart"; + public const string Doodad = "Doodad"; + public const string Wirecutters = "Wirecutters"; + public const string Multitool = "Multitool"; + public const string PowerCellAdmin = "PowerCellAdmin"; + public const string PowerCell = "PowerCell"; + public const string SteelWall = "SteelWall"; + public const string SteelGirder = "SteelGirder"; + public const string Plenum = "Plenum"; + public const string SteelGirderUnbolted = "SteelGirderUnbolted"; + public const string GlassReinforcedSheet = "GlassReinforcedSheet"; + public const string GlassSheet = "GlassSheet"; + public const string WoodLog = "WoodLog"; + public const string WoodPlank = "WoodPlank"; + public const string SteelRod = "SteelRod"; + public const string Welder = "Welder"; + public const string PlasmaTank = "PlasmaTank"; + public const string OxygenTank = "OxygenTank"; + public const string JumpsuitGrey = "JumpsuitGrey"; + public const string JumpsuitSecurity = "JumpsuitSecurity"; + public const string JumpsuitBotany = "JumpsuitBotany"; + public const string HumanIntestineSmall = "HumanIntestineSmall"; + public const string GlassShard = "GlassShard"; + public const string JumpsuitEngineer = "JumpsuitEngineer"; + public const string MicroLaser = "MicroLaser"; + public const string MatterBin = "MatterBin"; + public const string Medkit = "Medkit"; + public const string HealthScanner = "HealthScanner"; + public const string Hatchet = "Hatchet"; + public const string ElectricalWire = "ElectricalWire"; + public const string ElectricalCable = "ElectricalCable"; + public const string SteelWindow = "SteelWindow"; + public const string SteelWallReinforced = "SteelWallReinforced"; + public const string SteelWindowReinforced = "SteelWindowReinforced"; + public const string HeadsetSecurity = "HeadsetSecurity"; + public const string Headset = "Headset"; + public const string GloveInsulated = "GloveInsulated"; + public const string ShoeHiTops = "ShoeHiTops"; + public const string ShoeJackboots = "ShoeJackboots"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Materials.cs b/Assets/Scripts/SS3D/Data/Generated/Materials.cs index 801b843115..4d333ea351 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Materials.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Materials.cs @@ -1,13 +1,11 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class Materials { - public static DatabaseAsset DeleteConstruction = new DatabaseAsset("DeleteConstruction", "Materials"); - public static DatabaseAsset InvalidConstruction = new DatabaseAsset("InvalidConstruction", "Materials"); - public static DatabaseAsset ValidConstruction = new DatabaseAsset("ValidConstruction", "Materials"); + public const string DeleteConstruction = "DeleteConstruction"; + public const string InvalidConstruction = "InvalidConstruction"; + public const string ValidConstruction = "ValidConstruction"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs b/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs index f0d26c0901..67c8c6e970 100644 --- a/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs +++ b/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs @@ -1,13 +1,11 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class ParticlesEffects { - public static DatabaseAsset AttackParticles = new DatabaseAsset("AttackParticles", "ParticlesEffects"); - public static DatabaseAsset BleedingParticle = new DatabaseAsset("BleedingParticle", "ParticlesEffects"); - public static DatabaseAsset ConstructionParticle = new DatabaseAsset("ConstructionParticle", "ParticlesEffects"); + public const string AttackParticles = "AttackParticles"; + public const string BleedingParticle = "BleedingParticle"; + public const string ConstructionParticle = "ConstructionParticle"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Sounds.cs b/Assets/Scripts/SS3D/Data/Generated/Sounds.cs index df768b20f8..215805f6c6 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Sounds.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Sounds.cs @@ -1,21 +1,19 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class Sounds { - public static DatabaseAsset BikeHorn = new DatabaseAsset("BikeHorn", "Sounds"); - public static DatabaseAsset Title1 = new DatabaseAsset("Title1", "Sounds"); - public static DatabaseAsset Title2 = new DatabaseAsset("Title2", "Sounds"); - public static DatabaseAsset Title3 = new DatabaseAsset("Title3", "Sounds"); - public static DatabaseAsset Can1 = new DatabaseAsset("Can1", "Sounds"); - public static DatabaseAsset Can2 = new DatabaseAsset("Can2", "Sounds"); - public static DatabaseAsset Can3 = new DatabaseAsset("Can3", "Sounds"); - public static DatabaseAsset Can4 = new DatabaseAsset("Can4", "Sounds"); - public static DatabaseAsset AirlockClose = new DatabaseAsset("AirlockClose", "Sounds"); - public static DatabaseAsset AirlockOpen = new DatabaseAsset("AirlockOpen", "Sounds"); - public static DatabaseAsset FuelPowerGenerator = new DatabaseAsset("FuelPowerGenerator", "Sounds"); + public const string BikeHorn = "BikeHorn"; + public const string Title1 = "Title1"; + public const string Title2 = "Title2"; + public const string Title3 = "Title3"; + public const string Can1 = "Can1"; + public const string Can2 = "Can2"; + public const string Can3 = "Can3"; + public const string Can4 = "Can4"; + public const string AirlockClose = "AirlockClose"; + public const string AirlockOpen = "AirlockOpen"; + public const string FuelPowerGenerator = "FuelPowerGenerator"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs b/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs index 2aab27c614..b7ee1ba58d 100644 --- a/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs +++ b/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs @@ -1,11 +1,9 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class WorldSpaceUI { - public static DatabaseAsset LoadingBar = new DatabaseAsset("LoadingBar", "WorldSpaceUI"); + public const string LoadingBar = "LoadingBar"; } } From 0790a2c3df04b164aad0152f008e198ff6f3084c Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:36:33 -0500 Subject: [PATCH 02/54] Refactor asset retrieval in interactions and components to use Assets.Get method instead of DatabaseAsset's Prefab property, Create, Get() & CreateAs(...) functions, and different implicit operators. --- .../WorldObjectAssetReference.cs | 11 +++---- .../Interactions/ClientDelayedInteraction.cs | 6 ++-- .../Combat/Interactions/HitInteraction.cs | 5 +-- .../SS3D/Systems/Crafting/CraftingRecipe.cs | 2 +- .../Systems/Crafting/CraftingSubSystem.cs | 6 ++-- .../Systems/Electricity/FuelPowerGenerator.cs | 5 +-- .../Systems/Furniture/AirlockStateMachine.cs | 8 +++-- .../Furniture/DispenseProductInteraction.cs | 6 ++-- .../SS3D/Systems/Furniture/DragInteraction.cs | 5 +-- .../Furniture/LockLockerInteraction.cs | 6 ++-- .../Furniture/LockerDoorInteraction.cs | 5 +-- Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs | 4 ++- .../Furniture/UnlockLockerInteraction.cs | 5 +-- .../SS3D/Systems/Furniture/VendingMachine.cs | 28 +++++++++++------ .../SS3D/Systems/Health/BleedingBodyPart.cs | 3 +- .../Systems/Health/BodyParts/HeadBodyPart.cs | 9 +++--- .../Systems/Health/BodyParts/HumanTorso.cs | 31 ++++++++----------- .../Commands/AddHandCommand.cs | 14 ++++----- .../Containers/ContainerInteractive.cs | 21 ++++++++----- .../Inventory/Interactions/DropInteraction.cs | 5 +-- .../Inventory/Interactions/OpenInteraction.cs | 5 +-- .../Interactions/PickupInteraction.cs | 5 +-- .../Interactions/StoreInteraction.cs | 5 +-- .../Interactions/TakeFirstInteraction.cs | 5 +-- .../Interactions/ViewContainerInteraction.cs | 5 +-- .../Inventory/Items/Generic/BikeHorn.cs | 5 +-- .../Items/Generic/HonkInteraction.cs | 5 +-- .../Items/Generic/NukeDetonateInteraction.cs | 3 +- .../Systems/Inventory/Items/ItemSubSystem.cs | 13 ++++---- .../TileMapCreator/ConstructionHologram.cs | 15 ++++++--- .../PlayMode/Framework/Helpers/TestHelpers.cs | 2 +- 31 files changed, 142 insertions(+), 111 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index e37d02e615..b4586b67cc 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -14,19 +14,16 @@ public sealed class WorldObjectAssetReference : ScriptableObject /// The prefab of this asset reference. Here for quick access. /// [CanBeNull] - public GameObject Prefab => Asset.Get(); - - /// - /// Short access to the database asset. - /// - public DatabaseAsset Asset => new DatabaseAsset(Id, Database); + public GameObject Prefab => Assets.Get(Database, Id); /// /// Short access to the Assets.Get function. /// /// /// - public T Get() where T : Object => Asset.Get(); + [CanBeNull] + public T Get() + where T : Object => Assets.Get(Database, Id); #if UNITY_EDITOR [ReadOnly] diff --git a/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs b/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs index 1e6bd52870..619c9944b1 100644 --- a/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs +++ b/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs @@ -1,5 +1,4 @@ using Coimbra; -using Serilog; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; using UnityEngine; @@ -38,8 +37,9 @@ public bool ClientStart(InteractionEvent interactionEvent) { return true; } - - WorldSpaceUI.LoadingBar.CreateAs(out _loadingBarInstance, source.GameObject.transform); + + LoadingBar loadingBarPrefab = Assets.Get(AssetDatabases.WorldSpaceUI, WorldSpaceUI.LoadingBar); + _loadingBarInstance = Object.Instantiate(loadingBarPrefab, source.GameObject.transform); _loadingBarInstance.LocalPosition = LoadingBarOffset; _loadingBarInstance.Duration = Delay; diff --git a/Assets/Scripts/SS3D/Systems/Combat/Interactions/HitInteraction.cs b/Assets/Scripts/SS3D/Systems/Combat/Interactions/HitInteraction.cs index 395e39bea2..c4229a9134 100644 --- a/Assets/Scripts/SS3D/Systems/Combat/Interactions/HitInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Combat/Interactions/HitInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Interactions; +using SS3D.Data; +using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; using UnityEngine; @@ -22,7 +23,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Nuke; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Nuke); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs index 26d6c78bba..846984459b 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs @@ -25,7 +25,7 @@ public class CraftingRecipe : ScriptableObject /// /// First step of the recipe, which should have the same name as the target of the recipe. /// - public string RootStepName => Target.Prefab.name; + public string RootStepName => Target?.Get()?.name; public bool HasInitial => Steps.Any(x => x.IsInitialState); diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs index 56c2bc98c6..5fe7a64f1b 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs @@ -1,5 +1,4 @@ using Coimbra; -using Cysharp.Threading.Tasks; using FishNet; using FishNet.Object; using JetBrains.Annotations; @@ -15,7 +14,6 @@ using SS3D.Systems.Entities.Humanoid; using SS3D.Systems.Inventory.Items; using SS3D.Systems.Tile; -using System.Collections; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -601,8 +599,8 @@ private bool ItemTargetIsValid(InteractionEvent interactionEvent, Item target) [ObserversRpc] private void AddCraftingSmoke(GameObject target, int referenceId) { - GameObject particleGameObject = Instantiate(ParticlesEffects.ConstructionParticle.Prefab, target.transform.position, Quaternion.identity); - ParticleSystem particles = particleGameObject.GetComponent(); + ParticleSystem particlePrefab = Assets.Get(AssetDatabases.ParticlesEffects, ParticlesEffects.ConstructionParticle); + ParticleSystem particles = Instantiate(particlePrefab, target.transform.position, Quaternion.identity); // Get the shape module of the dust cloud particle system ParticleSystem.ShapeModule shapeModule = particles.shape; diff --git a/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs b/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs index 9213ce4428..1b7e3ad9d3 100644 --- a/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs +++ b/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs @@ -1,6 +1,7 @@ using FishNet.Object; using FishNet.Object.Synchronizing; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Systems.Audio; @@ -61,8 +62,8 @@ private void HandleSound(bool isEnabled) } else { - SubSystems.Get().PlayAudioSource(AudioType.Music, Sounds.FuelPowerGenerator, Position, NetworkObject, - true, 0.7f, 1, 1, 10); + AudioClip fuelPowerGeneratorClip = Assets.Get(AssetDatabases.Sounds, Sounds.FuelPowerGenerator); + SubSystems.Get().PlayAudioSource(AudioType.Music, fuelPowerGeneratorClip, Position, NetworkObject, true, 0.7f, 1, 1, 10); } } diff --git a/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs b/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs index bccf7e0a55..60f8695684 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs @@ -1,5 +1,6 @@ using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Systems.Audio; using UnityEngine; @@ -32,12 +33,15 @@ public override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo if (stateInfo.IsName(Opening)) { ChangeColors(_openingColor, animator); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.AirlockOpen, animator.GetComponent()); + AudioClip airlockOpenClip = Assets.Get(AssetDatabases.Sounds, Sounds.AirlockOpen); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, airlockOpenClip, animator.GetComponent()); } + if (stateInfo.IsName(Closing)) { ChangeColors(_closingColor, animator); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.AirlockClose, animator.GetComponent()); + AudioClip airlockCloseClip = Assets.Get(AssetDatabases.Sounds, Sounds.AirlockClose); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, airlockCloseClip, animator.GetComponent()); } } diff --git a/Assets/Scripts/SS3D/Systems/Furniture/DispenseProductInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/DispenseProductInteraction.cs index b22f095285..66e2c00b1b 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/DispenseProductInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/DispenseProductInteraction.cs @@ -1,8 +1,8 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; -using SS3D.Systems.Tile; using UnityEngine; namespace SS3D.Systems.Furniture @@ -39,7 +39,7 @@ public override bool CanInteract(InteractionEvent interactionEvent) /// public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Take; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); } /// diff --git a/Assets/Scripts/SS3D/Systems/Furniture/DragInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/DragInteraction.cs index 31b80dd77b..f615073542 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/DragInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/DragInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Systems.Entities; @@ -31,7 +32,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return InteractionIcons.Discard; + return Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Discard); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs index 80b51a5b31..c9c830da19 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs @@ -1,11 +1,11 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; using SS3D.Logging; using SS3D.Systems.Furniture; using SS3D.Systems.Inventory.Containers; -using System; using UnityEngine; namespace SS3D.Systems.Inventory.Interactions @@ -28,7 +28,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs index 25e3ec547a..23b832ab29 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using UnityEngine; @@ -21,7 +22,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs b/Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs index 2155866ba2..145d01f3cb 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs @@ -2,9 +2,11 @@ using SS3D.Interactions.Interfaces; using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Systems.Gamemodes; using SS3D.Systems.Inventory.Items.Generic; +using UnityEngine; namespace SS3D.Systems.Furniture { @@ -19,7 +21,7 @@ public void Detonate() IInteraction[] IInteractionTarget.CreateTargetInteractions(InteractionEvent interactionEvent) { - return new IInteraction[] { new NukeDetonateInteraction { Icon = InteractionIcons.Nuke } }; + return new IInteraction[] { new NukeDetonateInteraction { Icon = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Nuke) } }; } } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs index 0da1cbf769..b8e256f235 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; @@ -29,7 +30,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs index 2ce313c56b..efed611d73 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs @@ -1,5 +1,6 @@ using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Interfaces; @@ -55,33 +56,38 @@ public void DispenseProduct(int productIndex) { return; } - + if (productIndex >= _productsToDispense.Length) { - Log.Error(this, $"Product with index {productIndex} not found in products to dispense in {gameObject.name}. " - + $"Max possible index is {_productsToDispense.Length - 1}"); + Log.Error(this, $"Product with index {productIndex} not found in products to dispense in {gameObject.name}. Max possible index is {_productsToDispense.Length - 1}"); + return; } - + if (productIndex < 0) { Log.Error(this, $"Invalid product index, value must be between 0 and {_productsToDispense.Length - 1}"); + return; } VendingMachineProductStock productToDispenseStock = _productsToDispense[productIndex]; + AudioSubSystem audioSubSystem = SubSystems.Get(); + if (productToDispenseStock.Stock <= 0) { - SubSystems.Get().PlayAudioSource(Audio.AudioType.Sfx, Sounds.BikeHorn, Position, NetworkObject, - false, 0.7f, 1, 1, 3); + AudioClip bikeHornClip = Assets.Get(AssetDatabases.Sounds, Sounds.BikeHorn); + audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, bikeHornClip, Position, NetworkObject, false, 0.7f, 1, 1, 3); + return; } _powerConsumer.UseMachineOnce(); productToDispenseStock.Stock--; - SubSystems.Get().PlayAudioSource(Audio.AudioType.Sfx, Sounds.Can1, Position, NetworkObject, - false, 0.7f, 1, 1, 3); - + + AudioClip can1Clip = Assets.Get(AssetDatabases.Sounds, Sounds.Can1); + audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, can1Clip, Position, NetworkObject, false, 0.7f, 1, 1, 3); + ItemSubSystem itemSystem = SubSystems.Get(); Quaternion quaternion = Quaternion.Euler(new Vector3(Random.Range(0, 360), Random.Range(0, 360), Random.Range(0, 360))); @@ -95,6 +101,8 @@ public IInteraction[] CreateTargetInteractions(InteractionEvent interactionEvent { return Array.Empty(); } + + Sprite takeIcon = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); IInteraction[] interactions = new IInteraction[_productsToDispense.Length]; for (int i = 0; i < _productsToDispense.Length; i++) @@ -104,7 +112,7 @@ public IInteraction[] CreateTargetInteractions(InteractionEvent interactionEvent ProductName = _productsToDispense[i].Product.NameString, ProductIndex = i, ProductStock = _productsToDispense[i].Stock, - Icon = InteractionIcons.Take + Icon = takeIcon, }; } diff --git a/Assets/Scripts/SS3D/Systems/Health/BleedingBodyPart.cs b/Assets/Scripts/SS3D/Systems/Health/BleedingBodyPart.cs index 8d22bc0848..50c2631a7c 100644 --- a/Assets/Scripts/SS3D/Systems/Health/BleedingBodyPart.cs +++ b/Assets/Scripts/SS3D/Systems/Health/BleedingBodyPart.cs @@ -2,6 +2,7 @@ using FishNet.Object.Synchronizing; using UnityEngine; using Coimbra; +using SS3D.Data; using SS3D.Data.Generated; using System; @@ -43,7 +44,7 @@ public void SyncBleedEffect(bool prev, bool next, bool asServer) if (next && _bloodEffect == null) { - GameObject bleedingEffect = ParticlesEffects.BleedingParticle; + GameObject bleedingEffect = Assets.Get(AssetDatabases.ParticlesEffects, ParticlesEffects.BleedingParticle); GameObject bloodDisplayer; Transform bloodParent; if (_bodyPart.BodyCollider != null) diff --git a/Assets/Scripts/SS3D/Systems/Health/BodyParts/HeadBodyPart.cs b/Assets/Scripts/SS3D/Systems/Health/BodyParts/HeadBodyPart.cs index 6270187a4f..1b2bf1e559 100644 --- a/Assets/Scripts/SS3D/Systems/Health/BodyParts/HeadBodyPart.cs +++ b/Assets/Scripts/SS3D/Systems/Health/BodyParts/HeadBodyPart.cs @@ -1,10 +1,10 @@ using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Systems.Entities; using SS3D.Systems.Entities.Humanoid; using System.Collections; -using UnityEngine; using UnityEngine.Serialization; namespace SS3D.Systems.Health @@ -79,11 +79,10 @@ protected override void BeforeDestroyingBodyPart() protected override void SpawnOrgans() { - GameObject brainPrefab = Items.HumanBrain; - GameObject brainGameObject = Instantiate(brainPrefab); - Brain = brainGameObject.GetComponent(); + Brain brainPrefab = Assets.Get(AssetDatabases.Items, Items.HumanBrain); + Brain = Instantiate(brainPrefab); Brain.HealthController = HealthController; - Spawn(brainGameObject, Owner); + Spawn(Brain.GameObject, Owner); } } } diff --git a/Assets/Scripts/SS3D/Systems/Health/BodyParts/HumanTorso.cs b/Assets/Scripts/SS3D/Systems/Health/BodyParts/HumanTorso.cs index 9c3d008b16..6a40abd4a7 100644 --- a/Assets/Scripts/SS3D/Systems/Health/BodyParts/HumanTorso.cs +++ b/Assets/Scripts/SS3D/Systems/Health/BodyParts/HumanTorso.cs @@ -1,8 +1,7 @@ -using SS3D.Data.Generated; -using SS3D.Systems.Entities; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Systems.Health; using System.Collections; -using UnityEngine; public class HumanTorso : BodyPart { @@ -33,21 +32,17 @@ private IEnumerator AddInternalOrgans() protected override void SpawnOrgans() { - GameObject heartPrefab = Items.HumanHeart; - GameObject leftLungPrefab = Items.HumanLungLeft; - GameObject rightLungPrefab = Items.HumanLungRight;; - - GameObject heartGameObject = Instantiate(heartPrefab); - GameObject leftLungGameObject = Instantiate(leftLungPrefab); - GameObject rightLungGameObject = Instantiate(rightLungPrefab); - - Heart = heartGameObject.GetComponent(); - LeftLung = leftLungGameObject.GetComponent(); - RightLung = rightLungGameObject.gameObject.GetComponent(); - - Spawn(heartGameObject, Owner); - Spawn(leftLungGameObject, Owner); - Spawn(rightLungGameObject, Owner); + Heart heartPrefab = Assets.Get(AssetDatabases.Items, Items.HumanHeart); + Lungs leftLungPrefab = Assets.Get(AssetDatabases.Items, Items.HumanLungLeft); + Lungs rightLungPrefab = Assets.Get(AssetDatabases.Items, Items.HumanLungRight); + + Heart = Instantiate(heartPrefab); + LeftLung = Instantiate(leftLungPrefab); + RightLung = Instantiate(rightLungPrefab); + + Spawn(Heart.GameObject, Owner); + Spawn(LeftLung.GameObject, Owner); + Spawn(RightLung.GameObject, Owner); } protected override void AddInitialLayers() diff --git a/Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHandCommand.cs b/Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHandCommand.cs index 548ce6a427..e662e37190 100644 --- a/Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHandCommand.cs +++ b/Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHandCommand.cs @@ -5,6 +5,7 @@ using FishNet; using SS3D.Systems.Inventory.Containers; using FishNet.Connection; +using SS3D.Data; using SS3D.Permissions; using SS3D.Data.Generated; @@ -43,17 +44,16 @@ public override string Perform(string[] args, NetworkConnection conn) Player Player = SubSystems.Get().GetPlayer(ckey); Entity entity = SubSystems.Get().GetSpawnedEntity(Player); - GameObject leftHandPrefab = Items.HumanHandLeft; - GameObject leftHandObject = GameObject.Instantiate(leftHandPrefab, entity.transform); - leftHandObject.transform.localPosition = position; - leftHandObject.transform.localEulerAngles = rotation; + Hand leftHandPrefab = Assets.Get(AssetDatabases.Items, Items.HumanHandLeft); + Hand leftHand = Object.Instantiate(leftHandPrefab, entity.transform); + leftHand.Transform.localPosition = position; + leftHand.Transform.localEulerAngles = rotation; - Hand leftHand = leftHandObject.GetComponent(); - InstanceFinder.ServerManager.Spawn(leftHandObject, Player.Owner); + InstanceFinder.ServerManager.Spawn(leftHand.GameObject, Player.Owner); Hands hands = entity.GetComponent(); HumanInventory inventory = entity.GetComponent(); - inventory.TryAddContainer(leftHandObject.GetComponent()); + inventory.TryAddContainer(leftHand.GetComponent()); hands.AddHand(leftHand); return "hand added"; diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Containers/ContainerInteractive.cs b/Assets/Scripts/SS3D/Systems/Inventory/Containers/ContainerInteractive.cs index 948c090ee5..935606060d 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Containers/ContainerInteractive.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Containers/ContainerInteractive.cs @@ -1,4 +1,5 @@ -using System; +using SS3D.Data; +using System; using System.Collections.Generic; using SS3D.Interactions; using SS3D.Interactions.Interfaces; @@ -28,20 +29,25 @@ public override IInteraction[] CreateTargetInteractions(InteractionEvent interac List interactions = new(); + Sprite takeIcon = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); + Sprite openIcon = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); + StoreInteraction storeInteraction = new(attachedContainer) { - Icon = InteractionIcons.Take - }; + Icon = takeIcon, + }; + TakeFirstInteraction takeFirstInteraction = new(attachedContainer) { - Icon = InteractionIcons.Take + Icon = takeIcon, }; + ViewContainerInteraction view = new(attachedContainer) { - MaxDistance = attachedContainer.MaxDistance, Icon = _viewContainerIcon + MaxDistance = attachedContainer.MaxDistance, Icon = _viewContainerIcon, }; - view.Icon = InteractionIcons.Open; + view.Icon = openIcon; // Pile or Normal the Store Interaction will always appear, but View only appears in Normal containers if (IsOpen() | !attachedContainer.OnlyStoreWhenOpen | !attachedContainer.IsOpenable) @@ -65,8 +71,9 @@ public override IInteraction[] CreateTargetInteractions(InteractionEvent interac OpenInteraction openInteraction = new(attachedContainer) { - Icon = InteractionIcons.Open + Icon = openIcon, }; + openInteraction.OnOpenStateChanged += OpenStateChanged; interactions.Add(openInteraction); diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/DropInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/DropInteraction.cs index 7b30f8def5..9fb378d703 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/DropInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/DropInteraction.cs @@ -1,4 +1,5 @@ -using System; +using SS3D.Data; +using System; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; @@ -29,7 +30,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon ? Icon : InteractionIcons.Discard; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Discard); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/OpenInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/OpenInteraction.cs index 9f3e16cd9a..2f7a78c1cc 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/OpenInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/OpenInteraction.cs @@ -1,4 +1,5 @@ -using System; +using SS3D.Data; +using System; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; @@ -40,7 +41,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs index 8cffaf0b5d..2b06d30313 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Interactions; +using SS3D.Data; +using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; using SS3D.Systems.GameModes.Events; @@ -21,7 +22,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Take; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/StoreInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/StoreInteraction.cs index 98868b100b..ff833c2fb2 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/StoreInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/StoreInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; @@ -24,7 +25,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Discard; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Discard); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/TakeFirstInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/TakeFirstInteraction.cs index c818359b6a..f1289f8c6d 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/TakeFirstInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/TakeFirstInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Systems.Inventory.Containers; @@ -25,7 +26,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Take; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/ViewContainerInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/ViewContainerInteraction.cs index a2ae57681b..c3904a946a 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/ViewContainerInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/ViewContainerInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Systems.Entities; @@ -25,7 +26,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs index dabca2d112..9ebfb69273 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Interfaces; @@ -25,8 +26,8 @@ public class BikeHorn : Item public void Honk() { _animator.SetTrigger(HonkAnimation); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.BikeHorn, GameObject.transform.position, NetworkObject, - false,0.7f, 1, 1, 5); + AudioClip bikeHornClip = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, bikeHornClip, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } public bool IsHonking() diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/HonkInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/HonkInteraction.cs index 98be8c7f91..8014ef11ae 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/HonkInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/HonkInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; @@ -19,7 +20,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Honk; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Honk); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/NukeDetonateInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/NukeDetonateInteraction.cs index b09f8a900f..1d39f59c30 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/NukeDetonateInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/NukeDetonateInteraction.cs @@ -1,4 +1,5 @@ using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; @@ -23,7 +24,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Nuke; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Nuke); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSubSystem.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSubSystem.cs index d86c7385e1..84135067b0 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSubSystem.cs @@ -37,7 +37,7 @@ public void CmdSpawnItem(string id, Vector3 position, Quaternion rotation) [Server] public Item SpawnItem(string id, Vector3 position, Quaternion rotation) { - Item itemPrefab = Assets.Get(AssetDatabases.Items, id).GetComponent(); + Item itemPrefab = Assets.Get(AssetDatabases.Items, id); Item itemInstance = Instantiate(itemPrefab, position, rotation); ServerManager.Spawn(itemInstance.GameObject); @@ -69,15 +69,16 @@ public void CmdSpawnItemInContainer(Item id, AttachedContainer attachedContainer [Server] public Item SpawnItemInContainer(string id, AttachedContainer attachedContainer) { - Item itemPrefab = Assets.Get(AssetDatabases.Items, id).GetComponent(); + Item itemPrefab = Assets.Get(AssetDatabases.Items, id); - if (attachedContainer is null) + if (attachedContainer is not null && itemPrefab is not null) { - Log.Error(this, "Container does not found!", Logs.ServerOnly); - return null; + return SpawnItemInContainer(itemPrefab.GameObject, attachedContainer); } - return SpawnItemInContainer(itemPrefab.GameObject, attachedContainer); + Log.Error(this, "Container does not found!", Logs.ServerOnly); + return null; + } // diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologram.cs b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologram.cs index bfb291fd64..cacf91b4df 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologram.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologram.cs @@ -3,9 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using SS3D.Core.Behaviours; -using Coimbra; -using Actor = SS3D.Core.Behaviours.Actor; +using SS3D.Data; namespace SS3D.Systems.Tile.TileMapCreator { @@ -63,14 +61,21 @@ public ConstructionHologram(GameObject ghostObject, Vector3 targetPosition, Dire /// public void ChangeHologramColor(ConstructionMode mode) { - Material ghostMat = mode switch + Material ghostMat = null; + + string ghostMatName = mode switch { ConstructionMode.Valid => Materials.ValidConstruction, ConstructionMode.Invalid => Materials.InvalidConstruction, ConstructionMode.Delete => Materials.DeleteConstruction, - _ => null + _ => null, }; + if (ghostMatName != null) + { + ghostMat = Assets.Get(AssetDatabases.Materials, ghostMatName); + } + foreach (MeshRenderer mr in Hologram.GetComponentsInChildren()) { Material[] materials = mr.materials; diff --git a/Assets/Scripts/Tests/PlayMode/Framework/Helpers/TestHelpers.cs b/Assets/Scripts/Tests/PlayMode/Framework/Helpers/TestHelpers.cs index 38a31d9b4d..0608c87716 100644 --- a/Assets/Scripts/Tests/PlayMode/Framework/Helpers/TestHelpers.cs +++ b/Assets/Scripts/Tests/PlayMode/Framework/Helpers/TestHelpers.cs @@ -192,7 +192,7 @@ public static AttachedContainer LocalPlayerSpawnItemInFirstHandAvailable(string foreach (Hand hand in inventory.Hands.PlayerHands.Where(hand => hand.Container.Empty)) { - Item itemToSpawn = Assets.Get(AssetDatabases.Items, item).GetComponent(); + Item itemToSpawn = Assets.Get(AssetDatabases.Items, item)?.GetComponent(); itemSystem.CmdSpawnItemInContainer(itemToSpawn, hand.Container); From 8d877fc7d62f5e0f8106ad6865bd718e047d06a0 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:37:37 -0500 Subject: [PATCH 03/54] Removed the now unused class DatabaseAsset.cs --- .../SS3D/Data/AssetDatabases/DatabaseAsset.cs | 98 ------------------- .../Data/AssetDatabases/DatabaseAsset.cs.meta | 3 - 2 files changed, 101 deletions(-) delete mode 100644 Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs delete mode 100644 Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs.meta diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs deleted file mode 100644 index 80fb8402cb..0000000000 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs +++ /dev/null @@ -1,98 +0,0 @@ -using SS3D.Logging.LogSettings; -using UnityEngine; - -namespace SS3D.Data.AssetDatabases -{ - /// - /// Represents an asset data asset, contains the name of the asset and the related database. - /// - /// NOTE: The implicit operators have to be manually added for now. - /// - public sealed class DatabaseAsset - { - /// - /// The name of the asset. - /// - public readonly string Name; - - /// - /// The database this asset belongs to. - /// - public readonly string DatabaseName; - - /// - /// Returns the prefab of this asset as a GameObject. - /// - public GameObject Prefab => Get(); - - /// - /// Instantiates a new GameObject of this asset's prefab - /// - public GameObject Create(Transform parent = null) => GameObject.Instantiate(Prefab, parent); - - /// - /// Instantiates a new GameObject of this asset's prefab and gets a component in its main object. - /// - public GameObject CreateAs(out T component, Transform parent = null) - where T : class - { - GameObject gameObject = GameObject.Instantiate(Prefab, parent); - - component = gameObject.GetComponent(typeof(T)) as T; - - return gameObject; - } - - /// - /// This constructor specifies which databaseID to use and which asset ID, or name, to use. - /// - /// This is used by the AssetData system and is automated, you don't need to create an DatabaseAsset manually. - /// - public DatabaseAsset(string name, string databaseName) - { - Name = name; - DatabaseName = databaseName; - } - - /// - /// Gets this asset as T. - /// - /// The type to cast the asset to. - /// The casted asset. - public T Get() - where T : Object - { - return Assets.Get(DatabaseName, Name); - } - - public static implicit operator string(DatabaseAsset asset) - { - return asset.Name; - } - - public static implicit operator GameObject(DatabaseAsset asset) - { - return asset.Get(); - } - - public static implicit operator Sprite(DatabaseAsset asset) - { - return asset.Get(); - } - - public static implicit operator LogSettings(DatabaseAsset asset) - { - return asset.Get(); - } - - public static implicit operator Material(DatabaseAsset asset) - { - return asset.Get(); - } - - public static implicit operator AudioClip(DatabaseAsset asset) - { - return asset.Get(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs.meta b/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs.meta deleted file mode 100644 index c1b0a2ab0d..0000000000 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 00f88e8cc7e84ebbb3dff19c7aaf199f -timeCreated: 1695825631 \ No newline at end of file From 12db359d1bec44d2a0cc9526f3f0272e56bc234b Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:38:47 -0500 Subject: [PATCH 04/54] Rename DatabaseAssetCreator and DatabaseAssetWriter to DatabaseScriptCreator and DatabaseScriptWriter for consistency in asset management workflow. --- .../{DatabaseAssetCreator.cs => DatabaseScriptCreator.cs} | 4 ++-- ...baseAssetCreator.cs.meta => DatabaseScriptCreator.cs.meta} | 0 .../{DatabaseAssetWriter.cs => DatabaseScriptWriter.cs} | 2 +- ...tabaseAssetWriter.cs.meta => DatabaseScriptWriter.cs.meta} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename Assets/Scripts/SS3D/CodeGeneration/Creators/{DatabaseAssetCreator.cs => DatabaseScriptCreator.cs} (90%) rename Assets/Scripts/SS3D/CodeGeneration/Creators/{DatabaseAssetCreator.cs.meta => DatabaseScriptCreator.cs.meta} (100%) rename Assets/Scripts/SS3D/CodeGeneration/Writers/{DatabaseAssetWriter.cs => DatabaseScriptWriter.cs} (97%) rename Assets/Scripts/SS3D/CodeGeneration/Writers/{DatabaseAssetWriter.cs.meta => DatabaseScriptWriter.cs.meta} (100%) diff --git a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs similarity index 90% rename from Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs rename to Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs index 620fff1e12..f0674e7387 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs @@ -8,7 +8,7 @@ namespace SS3D.CodeGeneration.Creators { - public static class DatabaseAssetCreator + public static class DatabaseScriptCreator { #if UNITY_EDITOR /// @@ -26,7 +26,7 @@ public static void CreateAtPath(string path, string className, [NotNull] IEnumer Directory.CreateDirectory(fullPath); } - DatabaseAssetWriter.Write(fullPath, className, enums, namespaceName); + DatabaseScriptWriter.Write(fullPath, className, enums, namespaceName); if (EditorWindow.focusedWindow != null) { diff --git a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs.meta b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs.meta similarity index 100% rename from Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs.meta rename to Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs.meta diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs similarity index 97% rename from Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs rename to Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs index 74ffe4a7a6..ee2c0cc6e9 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs @@ -5,7 +5,7 @@ namespace SS3D.CodeGeneration { - public static class DatabaseAssetWriter + public static class DatabaseScriptWriter { /// /// Writes a static class of a DatabaseAssets from an AssetDatabase. diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs.meta b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs.meta similarity index 100% rename from Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs.meta rename to Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs.meta From 39c854399171ed5299320922c833126b163f2f27 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Thu, 29 Jan 2026 11:32:16 -0500 Subject: [PATCH 05/54] Fixing error of using interaction icon for audio clip (stupid me) --- Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs index 9ebfb69273..99f3393668 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs @@ -26,7 +26,7 @@ public class BikeHorn : Item public void Honk() { _animator.SetTrigger(HonkAnimation); - AudioClip bikeHornClip = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); + AudioClip bikeHornClip = Assets.Get(AssetDatabases.Sounds, Sounds.BikeHorn); SubSystems.Get().PlayAudioSource(AudioType.Sfx, bikeHornClip, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } From 7cfa5993cec7571830326739f43a39478bed62a3 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Fri, 30 Jan 2026 12:18:22 -0500 Subject: [PATCH 06/54] Commit 12db359d1bec44d2a0cc9526f3f0272e56bc234b missing reference changes. --- Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs | 2 +- .../Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs index aed793c552..9893e7bd13 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs @@ -144,7 +144,7 @@ public void GenerateDatabaseCode() return; } - DatabaseAssetCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values, DatabaseAssetNamespaceName); + DatabaseScriptCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values, DatabaseAssetNamespaceName); } #endif } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs index 9ffd513be4..aba78ee225 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs @@ -40,7 +40,7 @@ public void CreateDatabaseCode() const string dataPath = AssetDatabase.DatabaseAssetPath; - DatabaseAssetCreator.CreateAtPath(dataPath, "AssetDatabases", IncludedAssetDatabases); + DatabaseScriptCreator.CreateAtPath(dataPath, "AssetDatabases", IncludedAssetDatabases); } #endif } From 9271a30db5a360add10c63feaa02061e90efb548 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Fri, 30 Jan 2026 12:38:35 -0500 Subject: [PATCH 07/54] Refactor asset retrieval in WorldObjectAssetReference, CraftingRecipe, and Item to use Assets.Get method for improved consistency and clarity --- .../Data/AssetDatabases/WorldObjectAssetReference.cs | 9 --------- Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs | 3 ++- Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index b4586b67cc..baae1e24f5 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -16,15 +16,6 @@ public sealed class WorldObjectAssetReference : ScriptableObject [CanBeNull] public GameObject Prefab => Assets.Get(Database, Id); - /// - /// Short access to the Assets.Get function. - /// - /// - /// - [CanBeNull] - public T Get() - where T : Object => Assets.Get(Database, Id); - #if UNITY_EDITOR [ReadOnly] #endif diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs index 846984459b..d870f6078c 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs @@ -1,4 +1,5 @@ using QuikGraph; +using SS3D.Data; using SS3D.Data.AssetDatabases; using SS3D.Logging; using System.Collections.Generic; @@ -25,7 +26,7 @@ public class CraftingRecipe : ScriptableObject /// /// First step of the recipe, which should have the same name as the target of the recipe. /// - public string RootStepName => Target?.Get()?.name; + public string RootStepName => Target ? Assets.Get(Target.Database, Target.Id)?.name : null; public bool HasInitial => Steps.Any(x => x.IsInitialState); diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs index 4aa8518e8f..bbe857c979 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs @@ -6,6 +6,7 @@ using FishNet.Object; using FishNet.Object.Synchronizing; using SS3D.Attributes; +using SS3D.Data; using SS3D.Data.AssetDatabases; using SS3D.Interactions; using SS3D.Interactions.Interfaces; @@ -119,7 +120,7 @@ public WorldObjectAssetReference Asset } } - public Item Prefab => Asset.Get(); + public Item Prefab => Asset ? Assets.Get(Asset.Database, Asset.Id) : null; /// /// Initialise this item fields. Can only be called once. From 13fbaa14e21d41cb66e93da9cc590b698a876694 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Fri, 30 Jan 2026 12:45:45 -0500 Subject: [PATCH 08/54] Refactor asset retrieval in CraftingSubSystem and MultiStepCraftable to use Assets.Get method for improved consistency --- .../WorldObjectAssetReference.cs | 9 +------- .../Systems/Crafting/CraftingSubSystem.cs | 23 ++++++++++++------- .../Systems/Crafting/MultiStepCraftable.cs | 4 +++- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index baae1e24f5..f708c9f0c9 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -1,5 +1,4 @@ -using JetBrains.Annotations; -using SS3D.Attributes; +using SS3D.Attributes; using UnityEngine; namespace SS3D.Data.AssetDatabases @@ -10,12 +9,6 @@ namespace SS3D.Data.AssetDatabases /// public sealed class WorldObjectAssetReference : ScriptableObject { - /// - /// The prefab of this asset reference. Here for quick access. - /// - [CanBeNull] - public GameObject Prefab => Assets.Get(Database, Id); - #if UNITY_EDITOR [ReadOnly] #endif diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs index 5fe7a64f1b..ffe4dd3032 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs @@ -156,7 +156,8 @@ public void Craft(CraftingInteraction interaction, InteractionEvent interactionE { for (int i = 0; i < secondaryResult.Amount; i++) { - DefaultCraft(interaction, interactionEvent, secondaryResult.Asset.Prefab, link.Target); + GameObject secondaryResultPrefab = Assets.Get(secondaryResult.Asset.Database, secondaryResult.Asset.Id); + DefaultCraft(interaction, interactionEvent, secondaryResultPrefab, link.Target); } } @@ -189,7 +190,9 @@ private void SpawnOrModifyMainResult(WorldObjectAssetReference result, CraftingI { GameObject resultInstance; - if (!result.Prefab) + GameObject resultPrefab = Assets.Get(result.Database, result.Id); + + if (!resultPrefab) { Log.Error(this, $"World object reference {result} has no prefab associated"); return; @@ -197,11 +200,11 @@ private void SpawnOrModifyMainResult(WorldObjectAssetReference result, CraftingI if (link.Target.CustomCraft) { - resultInstance = result.Prefab.GetComponent()?.Craft(interaction, interactionEvent); + resultInstance = resultPrefab.GetComponent()?.Craft(interaction, interactionEvent); } else { - resultInstance = DefaultCraft(interaction, interactionEvent, result.Prefab, link.Target); + resultInstance = DefaultCraft(interaction, interactionEvent, resultPrefab, link.Target); } if (link.Tag == null || !link.Tag.ModifyResult) return; @@ -225,14 +228,16 @@ private string CurrentStepName(GameObject target) return ""; } - if (targetAssetReference.Asset.Prefab == null) + GameObject targetPrefab = Assets.Get(targetAssetReference.Asset.Database, targetAssetReference.Asset.Id); + + if (targetPrefab == null) { Log.Error(this, $"IWorldObjectAsset {targetAssetReference} has no prefab associated, returning"); return ""; } - string rootStepName = targetAssetReference.Asset.Prefab.name; + string rootStepName = targetPrefab.name; string stepName; if (target.TryGetComponent(out ICraftable craftableTarget) && craftableTarget.CurrentStepName != rootStepName) @@ -241,7 +246,7 @@ private string CurrentStepName(GameObject target) } else { - stepName = targetAssetReference.Asset.Prefab.name; + stepName = targetPrefab.name; } return stepName; @@ -548,7 +553,9 @@ private bool ResultIsValid(InteractionEvent interactionEvent, RecipeStep recipeS { if (!recipeStep.TryGetResult(out WorldObjectAssetReference recipeResult)) return true; - if (recipeResult.Prefab && recipeResult.Prefab.TryGetComponent(out PlacedTileObject result)) + GameObject recipeResultPrefab = Assets.Get(recipeResult.Database, recipeResult.Id); + + if (recipeResultPrefab && recipeResultPrefab.TryGetComponent(out PlacedTileObject result)) { return ResultIsValidPlacedTileObject(result, interactionEvent); } diff --git a/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs b/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs index 0d5ce51536..8a70bb5116 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs @@ -4,6 +4,7 @@ using SS3D.Core.Behaviours; using SS3D.Data.AssetDatabases; using FishNet.Object.Synchronizing; +using SS3D.Data; using SS3D.Logging; namespace SS3D.Systems.Crafting @@ -31,7 +32,8 @@ protected override void OnAwake() } else { - _currentStepName = targetAssetReference.Asset.Prefab.name; + GameObject targetPrefab = Assets.Get(targetAssetReference.Asset.Database, targetAssetReference.Asset.Id); + _currentStepName = targetPrefab?.name; } } } From 2c2d75daa83d2c9cd5d2d5eda013b7b14ef2f3d2 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Mon, 2 Feb 2026 13:52:12 -0500 Subject: [PATCH 09/54] Refactor asset management to use GUIDs for WorldObjectAssetReference and other places to streamline asset retrieval --- .../Creators/DatabaseScriptCreator.cs | 7 +- .../Writers/DatabaseScriptWriter.cs | 30 +-- .../SS3D/Data/AssetDatabases/AssetDatabase.cs | 8 +- .../AssetDatabases/AssetDatabaseSettings.cs | 2 +- .../AssetDatabasesCodeGenerator.cs | 37 ++-- .../AssetDatabaseInspectorEditor.cs | 22 ++- Assets/Scripts/SS3D/Data/Assets.cs | 14 +- .../SS3D/Data/Generated/AssetDatabases.cs | 14 +- .../SS3D/Data/Generated/CraftingRecipes.cs | 12 +- .../SS3D/Data/Generated/InteractionIcons.cs | 12 +- Assets/Scripts/SS3D/Data/Generated/Items.cs | 184 +++++++++--------- .../Scripts/SS3D/Data/Generated/Materials.cs | 6 +- .../SS3D/Data/Generated/ParticlesEffects.cs | 6 +- Assets/Scripts/SS3D/Data/Generated/Sounds.cs | 22 +-- .../SS3D/Data/Generated/WorldSpaceUI.cs | 2 +- Assets/Scripts/SS3D/Systems/Roles/RoleData.cs | 26 ++- .../Scripts/SS3D/Systems/Roles/RoleLoadout.cs | 9 +- .../SS3D/Systems/Roles/RoleSubSystem.cs | 28 +-- 18 files changed, 241 insertions(+), 200 deletions(-) diff --git a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs index f0674e7387..fc8c26581e 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; using System.Collections.Generic; using System.IO; -using System.Linq; using UnityEditor; using UnityEngine; using Object = UnityEngine.Object; @@ -14,10 +13,8 @@ public static class DatabaseScriptCreator /// /// Creates a list of database assets in the object path, with the defined class name and using a list of provided assets as its elements. /// - public static void CreateAtPath(string path, string className, [NotNull] IEnumerable assets, string namespaceName = "SS3D.Data.Generated") + public static void CreateAtPath(string path, string className, [NotNull] List assets, string namespaceName = "SS3D.Data.Generated") { - IEnumerable enums = assets.Select(reference => reference.name); - string dataPath = Application.dataPath; string fullPath = dataPath + path; @@ -26,7 +23,7 @@ public static void CreateAtPath(string path, string className, [NotNull] IEnumer Directory.CreateDirectory(fullPath); } - DatabaseScriptWriter.Write(fullPath, className, enums, namespaceName); + DatabaseScriptWriter.Write(fullPath, className, assets, namespaceName); if (EditorWindow.focusedWindow != null) { diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs index ee2c0cc6e9..8beb3940c7 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs @@ -1,7 +1,9 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; +using UnityEditor; +using Object = UnityEngine.Object; namespace SS3D.CodeGeneration { @@ -14,9 +16,9 @@ public static class DatabaseScriptWriter /// The name of the class, currently being the asset database name /// the elements to add to this class /// the namespace name to use - public static void Write(string filePath, string className, IEnumerable items, string namespaceName = "SS3D.Data.Enums") + public static void Write(string filePath, string className, List items, string namespaceName = "SS3D.Data.Enums") { - IEnumerable filtered = items.GroupBy(name => name).Select(nameGroup => nameGroup.Key); + items.Sort((obj1, obj2) => string.Compare(obj1.name, obj2.name, StringComparison.InvariantCulture)); SourceFile sourceFile = new(); @@ -27,22 +29,26 @@ public static void Write(string filePath, string className, IEnumerable using (new BracesScope(sourceFile)) { - for (int index = 0; index < filtered.ToList().Count; index++) + foreach (Object item in items) { - string member = filtered.ToList()[index]; + string itemPath = AssetDatabase.GetAssetPath(item); - if (string.IsNullOrWhiteSpace(member)) - { + if(string.IsNullOrEmpty(itemPath) || !File.Exists(itemPath)) + continue; + + if (!item || string.IsNullOrWhiteSpace(item.name)) continue; - } - char[] corrected = member.ToCharArray(); + char[] corrected = item.name.ToCharArray(); corrected[0] = corrected[0].ToString().ToUpper()[0]; StringBuilder stringBuilder = new(); stringBuilder.Append(corrected); - - sourceFile.AppendLine($"public const string {stringBuilder} = \"{stringBuilder}\";"); } + + string guid = AssetDatabase.AssetPathToGUID(itemPath); + + sourceFile.AppendLine($"public const string {stringBuilder} = \"{guid}\";"); + } } } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs index 9893e7bd13..b67e3be321 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs @@ -38,6 +38,8 @@ public sealed class AssetDatabase : ScriptableObject /// public string DatabaseName; + public string DatabaseID; + #if UNITY_EDITOR /// /// The asset group that constitutes this AssetDatabase, the system gets every asset from it and adds to an asset list. @@ -60,7 +62,7 @@ public void LoadAssetsFromAssetGroup() foreach (AddressableAssetEntry entry in AssetGroup.entries) { - Assets.TryAdd(entry.MainAsset.name, entry.MainAsset); + Assets.TryAdd(entry.guid, entry.MainAsset); } EditorUtility.SetDirty(this); @@ -83,7 +85,7 @@ public T Get([NotNull] string id) return null; } - if (typeof(T) != typeof(GameObject) && asset is GameObject gameObject) + if (typeof(T).IsSubclassOf(typeof(Component)) && asset is GameObject gameObject) { return gameObject.GetComponent(); } @@ -144,7 +146,7 @@ public void GenerateDatabaseCode() return; } - DatabaseScriptCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values, DatabaseAssetNamespaceName); + DatabaseScriptCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values.ToList(), DatabaseAssetNamespaceName); } #endif } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs index aba78ee225..63065acfc7 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs @@ -40,7 +40,7 @@ public void CreateDatabaseCode() const string dataPath = AssetDatabase.DatabaseAssetPath; - DatabaseScriptCreator.CreateAtPath(dataPath, "AssetDatabases", IncludedAssetDatabases); + DatabaseScriptCreator.CreateAtPath(dataPath, "AssetDatabases", new(IncludedAssetDatabases)); } #endif } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs index e2cda4f90a..470790d3ad 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs @@ -2,10 +2,12 @@ using Coimbra; using JetBrains.Annotations; using Serilog; +using System; using System.Collections.Generic; using System.Linq; using UnityEditor; using UnityEngine; +using Object = UnityEngine.Object; namespace SS3D.Data.AssetDatabases { @@ -76,33 +78,31 @@ private static void CreateWorldObjectAssetReferences(AssetDatabase assetDatabase int createdAssets = 0; int modifiedAssets = 0; - foreach (Object asset in assetDatabase.Assets.Values) + foreach ((string guid, Object asset) in assetDatabase.Assets) { if (asset is not GameObject gameObject) { continue; } + + WorldObjectAssetReference worldObjectAssetReference = SavedAssetReferences.Values.ToList().Find(reference => reference.Id == guid && reference.Database == assetDatabase.DatabaseID); - if (SavedAssetReferences.Values.ToList().Exists(reference => reference.Id == gameObject.name && reference.Database == assetDatabase.DatabaseName)) + if (worldObjectAssetReference) { - WorldObjectAssetReference worldObjectAssetReference = SavedAssetReferences.Values.ToList().Find(reference => reference.Id == gameObject.name && reference.Database == assetDatabase.DatabaseName); - UpdateWorldObjectAssetReference(worldObjectAssetReference, gameObject, ref modifiedAssets); } else { - WorldObjectAssetReference worldObjectAssetReference = CreateWorldObjectAssetReference(gameObject.name, assetDatabase.DatabaseName); + worldObjectAssetReference = CreateWorldObjectAssetReference(gameObject.name, guid, assetDatabase.DatabaseID); - string key = $"{WorldObjectAssetPath}{worldObjectAssetReference.Id}.asset"; + string key = $"{WorldObjectAssetPath}{gameObject.name}.asset"; - if (SavedAssetReferences.ContainsKey(key)) + if (!SavedAssetReferences.TryAdd(key, worldObjectAssetReference)) { Debug.LogError($"[{nameof(AssetDatabasesCodeGenerator)}] - {key} is already on the dictionary"); continue; } - SavedAssetReferences.Add(key, worldObjectAssetReference); - UpdateWorldObjectAssetReference(worldObjectAssetReference, gameObject, ref createdAssets); } } @@ -123,25 +123,25 @@ private static void CreateWorldObjectAssetReferences(AssetDatabase assetDatabase } } - private static WorldObjectAssetReference CreateWorldObjectAssetReference(string gameObjectName, string assetDatabaseName) + private static WorldObjectAssetReference CreateWorldObjectAssetReference(string fileName, string gameObjectID, string assetDatabaseName) { WorldObjectAssetReference worldObjectAssetReference = ScriptableObject.CreateInstance(); - worldObjectAssetReference.Id = gameObjectName; + worldObjectAssetReference.Id = gameObjectID; worldObjectAssetReference.Database = assetDatabaseName; - UnityEditor.AssetDatabase.CreateAsset(worldObjectAssetReference, $"{WorldObjectAssetPath}{worldObjectAssetReference.Id}.asset"); + UnityEditor.AssetDatabase.CreateAsset(worldObjectAssetReference, $"{WorldObjectAssetPath}{fileName}.asset"); HasModifiedAssetsWhenGenerating = true; - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Creating {worldObjectAssetReference.Id} WorldObjectReferenceAsset as it was missing."); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Creating {fileName} WorldObjectReferenceAsset as it was missing."); return worldObjectAssetReference; } private static void CleanupWorldObjectAssetReferences(List assetDatabases) { - List> assetsToDestroy = new List>(); + List> assetsToDestroy = new(); List> nullSavedAssetReferences = SavedAssetReferences.Where(pair => pair.Value == null).ToList(); foreach (KeyValuePair pair in nullSavedAssetReferences) @@ -149,16 +149,19 @@ private static void CleanupWorldObjectAssetReferences(List assetD SavedAssetReferences.Remove(pair.Key); } - List assetDatabaseAssets = new List(); + Dictionary assetsInDatabases = new(); foreach (AssetDatabase database in assetDatabases) { - assetDatabaseAssets.AddRange(database.Assets.Values.Select(o => o.name)); + foreach (string key in database.Assets.Keys) + { + assetsInDatabases.TryAdd(key, database.DatabaseID); + } } foreach (KeyValuePair savedAsset in SavedAssetReferences) { - if (assetDatabaseAssets.Exists(assetName => assetName == savedAsset.Value.Id)) + if (assetsInDatabases.TryGetValue(savedAsset.Value.Id, out string databaseID) && databaseID == savedAsset.Value.Database) { continue; } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/InspectorEditor/AssetDatabaseInspectorEditor.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/InspectorEditor/AssetDatabaseInspectorEditor.cs index 0bf73092cd..68d97ae5eb 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/InspectorEditor/AssetDatabaseInspectorEditor.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/InspectorEditor/AssetDatabaseInspectorEditor.cs @@ -1,11 +1,9 @@ #if UNITY_EDITOR -using SS3D.CodeGeneration; -using System; using System.Collections.Generic; +using System.IO; using UnityEditor; using UnityEditor.AddressableAssets.Settings; using UnityEditor.UIElements; -using UnityEngine; using UnityEngine.UIElements; using Object = UnityEngine.Object; @@ -29,7 +27,6 @@ private void OnEnable() _assetDatabase = (AssetDatabase)target; } -#if UNITY_EDITOR private void OnValidate() { if (_enumNameTextField != null) @@ -37,12 +34,13 @@ private void OnValidate() _assetDatabase.DatabaseName = _enumNameTextField.value; } + _assetDatabase.DatabaseID = GetDatabaseID(); + if (_assetGroupObjectField != null) { _assetDatabase.AssetGroup = _assetGroupObjectField.value as AddressableAssetGroup; } } -#endif /// /// This sets ups the UI for the custom inspector using the UI Toolkit @@ -95,6 +93,7 @@ public override VisualElement CreateInspectorGUI() private void HandleLoadAssetsButtonPressed() { _assetDatabase.DatabaseName = _enumNameTextField.value; + _assetDatabase.DatabaseID = GetDatabaseID(); _assetDatabase.AssetGroup = _assetGroupObjectField.value as AddressableAssetGroup; _assetDatabase.LoadAssetsFromAssetGroup(); @@ -114,6 +113,19 @@ private void HandleLoadAssetsButtonPressed() _assetDatabase.GenerateDatabaseCode(); } + + private string GetDatabaseID() + { + string assetPath = UnityEditor.AssetDatabase.GetAssetPath(_assetDatabase); + + if (!File.Exists(assetPath)) + { + return null; + } + + string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath); + return guid; + } } } #endif \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/Assets.cs b/Assets/Scripts/SS3D/Data/Assets.cs index 47cdf0a35e..a54c2e1b80 100644 --- a/Assets/Scripts/SS3D/Data/Assets.cs +++ b/Assets/Scripts/SS3D/Data/Assets.cs @@ -27,7 +27,17 @@ public static class Assets public static TAsset Get([NotNull] string databaseId, [NotNull] string assetId) where TAsset : Object { - return GetDatabase(databaseId).Get(assetId); + return GetDatabase(databaseId)?.Get(assetId); + } + + /// + /// Returns an asset from a database casting the object found to TAsset. + /// + [CanBeNull] + public static TAsset Get([NotNull] WorldObjectAssetReference assetReference) + where TAsset : Object + { + return GetDatabase(assetReference.Database)?.Get(assetReference.Id); } /// @@ -51,7 +61,7 @@ public static void LoadAssetDatabases() for (int index = 0; index < assetDatabases.Count; index++) { AssetDatabase database = assetDatabases[index]; - Databases.Add(database.DatabaseName, database); + Databases.Add(database.DatabaseID, database); } Log.Information(typeof(Assets), "{assetDatabasesCount} Asset Databases initialized", Logs.Important, assetDatabases.Count); diff --git a/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs b/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs index 10207e4a1d..d78e7ebed6 100644 --- a/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs +++ b/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs @@ -3,13 +3,13 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class AssetDatabases { - public const string CraftingRecipes = "CraftingRecipes"; - public const string InteractionIcons = "InteractionIcons"; - public const string Items = "Items"; - public const string Materials = "Materials"; - public const string ParticlesEffects = "ParticlesEffects"; - public const string Sounds = "Sounds"; - public const string WorldSpaceUI = "WorldSpaceUI"; + public const string CraftingRecipes = "c8a3b9b514b2f7543a544259c3c97b81"; + public const string InteractionIcons = "cdf9511d9049fa14ab0433934f3537ec"; + public const string Items = "c2644d7b34e956743a0bc485e7ca5e37"; + public const string Materials = "acbbffb4c89caec469bb21b6197c7626"; + public const string ParticlesEffects = "099b9943e9299d54b82d2c1163500458"; + public const string Sounds = "43b69e36c49203a44bf20042cd83de81"; + public const string WorldSpaceUI = "830650063081cdf4d90087fc2ac74d24"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs b/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs index 9b463ea206..ac36154e93 100644 --- a/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs +++ b/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs @@ -3,12 +3,12 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class CraftingRecipes { - public const string WeirdComplexRecipe = "WeirdComplexRecipe"; - public const string SteelGirderUnboltedRecipe = "SteelGirderUnboltedRecipe"; - public const string SteelSheetRecipe = "SteelSheetRecipe"; - public const string ReinforcedWallRecipe = "ReinforcedWallRecipe"; - public const string SteelWallRecipe = "SteelWallRecipe"; - public const string SteelGirderRecipe = "SteelGirderRecipe"; + public const string ReinforcedWallRecipe = "115e1db3f2858c14fa6b736f67e552be"; + public const string SteelGirderRecipe = "3decef2c351e13b4194d1994c485a170"; + public const string SteelGirderUnboltedRecipe = "41ed3a9a199817b47b7ba22ecb7c1ab4"; + public const string SteelSheetRecipe = "b7f1e5d68b05f6743a606736245ff481"; + public const string SteelWallRecipe = "3d6dc37a96797e442bafcb066f1f9aef"; + public const string WeirdComplexRecipe = "5069902a314070f4ca869692cbc791fa"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs b/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs index 4ccbabfb44..ccd3ed0558 100644 --- a/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs +++ b/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs @@ -3,12 +3,12 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class InteractionIcons { - public const string Power = "Power"; - public const string Take = "Take"; - public const string Open = "Open"; - public const string Discard = "Discard"; - public const string Honk = "Honk"; - public const string Nuke = "Nuke"; + public const string Discard = "e4d142ab75244e24c89d0c2aec36dbed"; + public const string Honk = "88c0c549992b597489791caf4a12f18c"; + public const string Nuke = "3030468639c4d15459be5f65d30a42df"; + public const string Open = "1f97d7fac1be1b448824c85e156d9746"; + public const string Power = "b22067d36fa963b4bbaf8d6085b0ebc9"; + public const string Take = "2db953f2ae8f41d4e9842d9144a9e396"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Items.cs b/Assets/Scripts/SS3D/Data/Generated/Items.cs index e86339775e..079dc3d5d4 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Items.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Items.cs @@ -3,98 +3,98 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class Items { - public const string BikeHorn = "BikeHorn"; - public const string NuclearAuthenticationDisk = "NuclearAuthenticationDisk"; - public const string ToolboxBlue = "ToolboxBlue"; - public const string SecurityPDA = "SecurityPDA"; - public const string SecurityIDCard = "SecurityIDCard"; - public const string PDA = "PDA"; - public const string IDCard = "IDCard"; - public const string Mug = "Mug"; - public const string SodaCanCola = "SodaCanCola"; - public const string SodaCanCannedLaughter = "SodaCanCannedLaughter"; - public const string SodaCanCannedAir = "SodaCanCannedAir"; - public const string SodaCanTonic = "SodaCanTonic"; - public const string SodaCanBeepyLime = "SodaCanBeepyLime"; - public const string SodaCanBeepsSoda = "SodaCanBeepsSoda"; - public const string SodaCanDukePurpleTea = "SodaCanDukePurpleTea"; - public const string Poster = "Poster"; - public const string MedicalPatch = "MedicalPatch"; - public const string BrutePatch = "BrutePatch"; - public const string BurnPatch = "BurnPatch"; - public const string DonkPocket = "DonkPocket"; - public const string Boombox = "Boombox"; - public const string FloorTile = "FloorTile"; - public const string SteelReinforcedSheet = "SteelReinforcedSheet"; - public const string SteelSheet = "SteelSheet"; - public const string Crowbar = "Crowbar"; - public const string ScrewdriverBlue = "ScrewdriverBlue"; - public const string Wrench = "Wrench"; - public const string FlashlightBlue = "FlashlightBlue"; - public const string KitchenKnife = "KitchenKnife"; - public const string TruckerCap = "TruckerCap"; - public const string Sunglasses = "Sunglasses"; - public const string FacewearGasMask = "FacewearGasMask"; - public const string HumanArmLeft = "HumanArmLeft"; - public const string HumanArmRight = "HumanArmRight"; - public const string HumanEarLeft = "HumanEarLeft"; - public const string HumanEarRight = "HumanEarRight"; - public const string HumanFootLeft = "HumanFootLeft"; - public const string HumanFootRight = "HumanFootRight"; - public const string HumanHandLeft = "HumanHandLeft"; - public const string HumanHandRight = "HumanHandRight"; - public const string HumanHead = "HumanHead"; - public const string HumanLegLeft = "HumanLegLeft"; - public const string HumanTorso = "HumanTorso"; - public const string HumanLegRight = "HumanLegRight"; - public const string HumanLungRight = "HumanLungRight"; - public const string HumanLungLeft = "HumanLungLeft"; - public const string HumanStomach = "HumanStomach"; - public const string HumanLiver = "HumanLiver"; - public const string HumanIntestineLarge = "HumanIntestineLarge"; - public const string HumanEye = "HumanEye"; - public const string HumanBrain = "HumanBrain"; - public const string Toolbelt = "Toolbelt"; - public const string Backpack = "Backpack"; - public const string HumanHeart = "HumanHeart"; - public const string Doodad = "Doodad"; - public const string Wirecutters = "Wirecutters"; - public const string Multitool = "Multitool"; - public const string PowerCellAdmin = "PowerCellAdmin"; - public const string PowerCell = "PowerCell"; - public const string SteelWall = "SteelWall"; - public const string SteelGirder = "SteelGirder"; - public const string Plenum = "Plenum"; - public const string SteelGirderUnbolted = "SteelGirderUnbolted"; - public const string GlassReinforcedSheet = "GlassReinforcedSheet"; - public const string GlassSheet = "GlassSheet"; - public const string WoodLog = "WoodLog"; - public const string WoodPlank = "WoodPlank"; - public const string SteelRod = "SteelRod"; - public const string Welder = "Welder"; - public const string PlasmaTank = "PlasmaTank"; - public const string OxygenTank = "OxygenTank"; - public const string JumpsuitGrey = "JumpsuitGrey"; - public const string JumpsuitSecurity = "JumpsuitSecurity"; - public const string JumpsuitBotany = "JumpsuitBotany"; - public const string HumanIntestineSmall = "HumanIntestineSmall"; - public const string GlassShard = "GlassShard"; - public const string JumpsuitEngineer = "JumpsuitEngineer"; - public const string MicroLaser = "MicroLaser"; - public const string MatterBin = "MatterBin"; - public const string Medkit = "Medkit"; - public const string HealthScanner = "HealthScanner"; - public const string Hatchet = "Hatchet"; - public const string ElectricalWire = "ElectricalWire"; - public const string ElectricalCable = "ElectricalCable"; - public const string SteelWindow = "SteelWindow"; - public const string SteelWallReinforced = "SteelWallReinforced"; - public const string SteelWindowReinforced = "SteelWindowReinforced"; - public const string HeadsetSecurity = "HeadsetSecurity"; - public const string Headset = "Headset"; - public const string GloveInsulated = "GloveInsulated"; - public const string ShoeHiTops = "ShoeHiTops"; - public const string ShoeJackboots = "ShoeJackboots"; + public const string Backpack = "ddaa28fac1956b2428aff1dac1d89707"; + public const string BikeHorn = "11f824c472e04854e95065dda095e8f4"; + public const string Boombox = "1d2cf546d53e3fe4c9103007427aaec7"; + public const string BrutePatch = "b5be0a52925e2674193d081d2deb68cb"; + public const string BurnPatch = "162e188d33a82b440a239f20901c716a"; + public const string Crowbar = "7becfab153276864f9fc7636a839d837"; + public const string DonkPocket = "56b1aff2041026242bed0f064dee56bb"; + public const string Doodad = "f6528d8afa18fa14998a0158260ef26c"; + public const string ElectricalCable = "0e69918696f58e04f846e985ec7405fe"; + public const string ElectricalWire = "cc71128d4bcc0c548ac11481000ac424"; + public const string FacewearGasMask = "bf177f8bab26bc84b87fd9a971004418"; + public const string FlashlightBlue = "781dd9024aaa53444bc3deeaa9708fbb"; + public const string FloorTile = "404443f7c306fc8469698745624fa3bf"; + public const string GlassReinforcedSheet = "a1a7407e08bb2914c97f431063bf83e2"; + public const string GlassShard = "5cab1a9f6c7f74948b84d0d625319efe"; + public const string GlassSheet = "e2a06f02e6a7e0348bdc535344bfe1f3"; + public const string GloveInsulated = "65679cf5a30d6dd458666804af7c3ca3"; + public const string Hatchet = "9e967cb4084bf064c8a0ca5f57a33b0c"; + public const string Headset = "db15899bc1eb2794fb2b24129852a209"; + public const string HeadsetSecurity = "a38ee818c953a404787757d8d20d2851"; + public const string HealthScanner = "e9f99df80a74fd242aa46e53c7ec0376"; + public const string HumanArmLeft = "06b6be83779804245b7f6411fe07b851"; + public const string HumanArmRight = "432a4ad70e41e5c4f8f913f76fe0e66c"; + public const string HumanBrain = "7579883b8dd8801448a176adace4860b"; + public const string HumanEarLeft = "e02f11b9239b52748a5ed5afd1c5cbd3"; + public const string HumanEarRight = "30794a01d5f4c174a9d20b2c632f2dca"; + public const string HumanEye = "071581df025e1ba49a8a75eb39611ff6"; + public const string HumanFootLeft = "94aaf82bb6ab002418e01d9cc7c6eaaa"; + public const string HumanFootRight = "e60ba1e09be8316448e419ecbdfb64a6"; + public const string HumanHandLeft = "35dfc7c3f708a5b48a206b4a44e7ab49"; + public const string HumanHandRight = "7f5954f009d06b2439ca637b43920440"; + public const string HumanHead = "cc54bc74b2f4c2349b1f84b501b0a091"; + public const string HumanHeart = "fccdc78a6cf916047ba52f2877f755e5"; + public const string HumanIntestineLarge = "1e304f9a331c2ba419514ef8afb8a13c"; + public const string HumanIntestineSmall = "9c5418cbebef419429574992d3e296a3"; + public const string HumanLegLeft = "ecaf79b0a74bdb443a350e88daa94a66"; + public const string HumanLegRight = "242a937784a622f4f8a6e6d097e0737c"; + public const string HumanLiver = "d75ff9a3ac207a84487ec1ee73a676fc"; + public const string HumanLungLeft = "a019475d05ec8824494b0fa88e2282d8"; + public const string HumanLungRight = "a8b265034e3f79344a6067b406e1bff6"; + public const string HumanStomach = "2bc6f6a968d5ba04c919ba56d0ccdab4"; + public const string HumanTorso = "4a9d34a6cf84ef045a740513d8ae30b1"; + public const string IDCard = "d8b0c8d1ddcdeb24d9763054c103c9fe"; + public const string JumpsuitBotany = "be3fcf1a74268ad49bfedb1edd9f5318"; + public const string JumpsuitEngineer = "7436f4976849b994aaee40df1bca7d89"; + public const string JumpsuitGrey = "236b51ddc6f9aa94ca92579082370c06"; + public const string JumpsuitSecurity = "93ad90421a3b2f64e8fdb9e95a42ba90"; + public const string KitchenKnife = "411b513efc8f06a40aecfc47d0c5fc5a"; + public const string MatterBin = "ed77d98d3e75b7946b404face1fe8f82"; + public const string MedicalPatch = "2332a158259900e4f8a237fa8daff266"; + public const string Medkit = "1e64a1c37be1f7c44a5d242d6ec6da10"; + public const string MicroLaser = "84cec183559b4954c883b11f20f767c9"; + public const string Mug = "d9aabfd5d726a7f499b8e360d919eba4"; + public const string Multitool = "2ca5f2886cf2f19428b50bf284689b86"; + public const string NuclearAuthenticationDisk = "1ae18785d74e9fa4699b6f6de889c243"; + public const string OxygenTank = "5479411218b869144b7d09d6db6dc58e"; + public const string PDA = "79260483ae5d3e04fa272e092b49abac"; + public const string PlasmaTank = "e3fb39f0a84acf541b6ee828550a1708"; + public const string Plenum = "3b33b5cf16a677a4e85a110679cde32a"; + public const string Poster = "b044d7bdb55405046a9055726a779eb1"; + public const string PowerCell = "de67200a4c96d444f800399a033ddfef"; + public const string PowerCellAdmin = "c69ed93dc225ea049bbf1a02662c48c0"; + public const string ScrewdriverBlue = "9c8363ee7f934bd4b8ee5a2e30da1269"; + public const string SecurityIDCard = "ff95abc9c2b779340a1b50f1a128a934"; + public const string SecurityPDA = "2a63163a4db141744a802f3ff67087db"; + public const string ShoeHiTops = "81faf4debf00a0a478b924176f48d011"; + public const string ShoeJackboots = "535ed7c02b5cbdc43ae2b234a963c5cc"; + public const string SodaCanBeepsSoda = "f490a74616c067c4f83995017e10b420"; + public const string SodaCanBeepyLime = "4e6899916bc8fd742a07f32b3a04de12"; + public const string SodaCanCannedAir = "e4281cb43d1443d4388737777fdd98d8"; + public const string SodaCanCannedLaughter = "dceb056e41b5c634f9933423de8e075c"; + public const string SodaCanCola = "92d6696a323ef66448190e8e9d69fd22"; + public const string SodaCanDukePurpleTea = "177428b73bad0fb4a89d1a64b85629bf"; + public const string SodaCanTonic = "a7c35693adae32f43b4d7fe2eb8b091b"; + public const string SteelGirder = "6c2559c2017ada740b245951a23c2e1d"; + public const string SteelGirderUnbolted = "5dba4171f2124fb48b0e32c0e10841e0"; + public const string SteelReinforcedSheet = "f88a398ad3d01454f955de9c337d9b99"; + public const string SteelRod = "48fa93e2da7acb3499e400becf2afc26"; + public const string SteelSheet = "4cb99cf2fee96f944abbacc51b0b701c"; + public const string SteelWall = "45d13347efae0f54882e0e56dd770bb1"; + public const string SteelWallReinforced = "abcc60752234e584d8d98c9dec03e7cc"; + public const string SteelWindow = "b9c224febb4233f4e912745553097652"; + public const string SteelWindowReinforced = "f2493b5478dd8e946ba98861f533362e"; + public const string Sunglasses = "9b9f6bd470226a74b903e74dbe9e423a"; + public const string Toolbelt = "40d904629802fc942860ce878e78efef"; + public const string ToolboxBlue = "264ea51d92067c14ebc6633999afac78"; + public const string TruckerCap = "1ef3c21a685ec2d4e9f0876719839d5f"; + public const string Welder = "06d944205e6b6dd489af078fa85fb878"; + public const string Wirecutters = "41a1c8c211dc32c4d8ffca5f0892f9dc"; + public const string WoodLog = "2767aeb6e6fd53b43a1cb305789834d4"; + public const string WoodPlank = "4aee3fb97a6a2d442804c8c0b8347a92"; + public const string Wrench = "772da386eb7b01745913050fee544c32"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Materials.cs b/Assets/Scripts/SS3D/Data/Generated/Materials.cs index 4d333ea351..34609dfe82 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Materials.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Materials.cs @@ -3,9 +3,9 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class Materials { - public const string DeleteConstruction = "DeleteConstruction"; - public const string InvalidConstruction = "InvalidConstruction"; - public const string ValidConstruction = "ValidConstruction"; + public const string DeleteConstruction = "ed5a1263eb564c94abc6407ac0919ea7"; + public const string InvalidConstruction = "e9b99cfb2e59ffa40a062c2f4b88b729"; + public const string ValidConstruction = "6d2a18aa72cbaf94694dce9f8451160b"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs b/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs index 67c8c6e970..150edd3aaa 100644 --- a/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs +++ b/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs @@ -3,9 +3,9 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class ParticlesEffects { - public const string AttackParticles = "AttackParticles"; - public const string BleedingParticle = "BleedingParticle"; - public const string ConstructionParticle = "ConstructionParticle"; + public const string AttackParticles = "17b0d9163e9cdf14aa557557e7d9d76b"; + public const string BleedingParticle = "a6a77c26ee7edd94c804f4ddd851c8ba"; + public const string ConstructionParticle = "ca5e6b5f7c6c5054a8f8155ef44e3e43"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Sounds.cs b/Assets/Scripts/SS3D/Data/Generated/Sounds.cs index 215805f6c6..7f9b38cb91 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Sounds.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Sounds.cs @@ -3,17 +3,17 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class Sounds { - public const string BikeHorn = "BikeHorn"; - public const string Title1 = "Title1"; - public const string Title2 = "Title2"; - public const string Title3 = "Title3"; - public const string Can1 = "Can1"; - public const string Can2 = "Can2"; - public const string Can3 = "Can3"; - public const string Can4 = "Can4"; - public const string AirlockClose = "AirlockClose"; - public const string AirlockOpen = "AirlockOpen"; - public const string FuelPowerGenerator = "FuelPowerGenerator"; + public const string AirlockClose = "fc2485e75c5d3ab4e86e814043c9e9cb"; + public const string AirlockOpen = "34297ba204a9f3944872f100baaa2369"; + public const string BikeHorn = "8c8823796bbcb23438fcf68260070383"; + public const string Can1 = "1a34c805f84be3b4caac14d7de790607"; + public const string Can2 = "8d93fdf9dcada204a952e29213f0293f"; + public const string Can3 = "b315c4abdef36244fb211c5f643d411a"; + public const string Can4 = "f00c6b5a098e84b4b87d80d23b4f295a"; + public const string FuelPowerGenerator = "59b65ecaf8dffbf49876ab2768490b59"; + public const string Title1 = "ec8b849764a7e9147b2a565f81a1ca42"; + public const string Title2 = "3f51862f0b88a5243a8cceb97147489d"; + public const string Title3 = "fd331e360db5fbb448e66367e41d1893"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs b/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs index b7ee1ba58d..70ba1a4430 100644 --- a/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs +++ b/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs @@ -3,7 +3,7 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class WorldSpaceUI { - public const string LoadingBar = "LoadingBar"; + public const string LoadingBar = "03bcc1824d3b20748b912ca532f86bb9"; } } diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs index 536db3a790..0daeada4c1 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs @@ -1,3 +1,4 @@ +using SS3D.Data.AssetDatabases; using System; using System.Collections.Generic; using UnityEngine; @@ -11,16 +12,25 @@ namespace SS3D.Systems.Roles [Serializable, CreateAssetMenu(fileName = "Role Data", menuName = "Roles/RoleData")] public class RoleData : ScriptableObject { - [SerializeField] private string _roleName; - [SerializeField] private GameObject _pdaPrefab; - [SerializeField] private GameObject _idCardPrefab; - [SerializeField] private List _permissions = new List(); - [SerializeField] private RoleLoadout _loadout; + [SerializeField] + private string _roleName; + [SerializeField] + private WorldObjectAssetReference _pdaAsset; + [SerializeField] + private WorldObjectAssetReference _idCardAsset; + [SerializeField] + private List _permissions = new(); + [SerializeField] + private RoleLoadout _loadout; public string Name => _roleName; - public GameObject IDCardPrefab => _idCardPrefab; - public GameObject PDAPrefab => _pdaPrefab; + + public WorldObjectAssetReference IDCardAsset => _idCardAsset; + + public WorldObjectAssetReference PDAAsset => _pdaAsset; + public List Permissions => _permissions; + public RoleLoadout Loadout => _loadout; } -} +} \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs index 8e3320f079..55b9126747 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs @@ -1,7 +1,7 @@ using Coimbra; +using SS3D.Data.AssetDatabases; using SS3D.Systems.Inventory.Containers; using UnityEngine; -using UnityEngine.Serialization; namespace SS3D.Systems.Roles { @@ -11,10 +11,9 @@ namespace SS3D.Systems.Roles [CreateAssetMenu(fileName = "Loadout", menuName = "Roles/Loadout")] public class RoleLoadout : ScriptableObject { - public GameObject HandLeft; - public GameObject HandRight; + public WorldObjectAssetReference HandLeftAsset; + public WorldObjectAssetReference HandRightAsset; - [FormerlySerializedAs("ItemsToEquip")] - public SerializableDictionary Equipment; + public SerializableDictionary EquipmentAssets; } } diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs index efd60ed3fe..97bd3cf324 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs @@ -11,6 +11,8 @@ using SS3D.Systems.Inventory.Containers; using SS3D.Systems.Inventory.Items; using SS3D.Core; +using SS3D.Data; +using SS3D.Data.AssetDatabases; using SS3D.Systems.Inventory.Items.Generic; namespace SS3D.Systems.Roles @@ -166,8 +168,8 @@ private void SpawnIdentificationItems(Entity entity, RoleData role) if (!inventory.TryGetTypeContainer(ContainerType.Identification, 0, out AttachedContainer container)) return; - Item pdaItem = itemSystem.SpawnItemInContainer(role.PDAPrefab, container); - Item idCardItem = itemSystem.SpawnItem(role.IDCardPrefab.name, Vector3.zero, Quaternion.identity); + Item pdaItem = SpawnItemInSlot(role.PDAAsset, true, container); + Item idCardItem = itemSystem.SpawnItem(role.IDCardAsset.Id, Vector3.zero, Quaternion.identity); PDA pda = (PDA)pdaItem; IDCard idCard = (IDCard)idCardItem; @@ -207,9 +209,9 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) containers.Add(inventoryContainer.ContainerType, inventoryContainer); } - foreach (KeyValuePair itemToEquip in loadout.Equipment) + foreach (KeyValuePair itemToEquip in loadout.EquipmentAssets) { - if (itemToEquip.Value == null) + if (!itemToEquip.Value) { continue; } @@ -220,16 +222,15 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) } } - if (loadout.HandLeft != null) + if (loadout.HandLeftAsset) { - SpawnItemInSlot(loadout.HandLeft, true, handContainers[0]); + SpawnItemInSlot(loadout.HandLeftAsset, true, handContainers[0]); } - if (loadout.HandRight != null) + if (loadout.HandRightAsset) { - SpawnItemInSlot(loadout.HandRight, true, handContainers[1]); + SpawnItemInSlot(loadout.HandRightAsset, true, handContainers[1]); } - inventory.TriggerInventorySetup(); } @@ -237,18 +238,19 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) /// /// Spawns an item inside a container slot after checking for boolean /// - /// The id of the item to be spawned + /// /// Condition indicating if the item should be spawned /// Container the item will be spawned in - private void SpawnItemInSlot(GameObject itemId, bool shouldSpawn, AttachedContainer container) + private Item SpawnItemInSlot(WorldObjectAssetReference assetReference, bool shouldSpawn, AttachedContainer container) { if (!shouldSpawn) { - return; + return null; } ItemSubSystem itemSystem = SubSystems.Get(); - itemSystem.SpawnItemInContainer(itemId, container); + GameObject gameObjectToSpawn = Assets.Get(assetReference); + return itemSystem.SpawnItemInContainer(gameObjectToSpawn, container); } } } \ No newline at end of file From 3cc5aa5b3b04cab1fd19e2a1d94e880dcf17e17c Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Mon, 2 Feb 2026 14:08:15 -0500 Subject: [PATCH 10/54] Update asset IDs and databases for various items to improve asset management consistency --- .../Data/Databases/CraftingRecipes.asset | 13 +- .../Data/Databases/InteractionIcons.asset | 13 +- Assets/Content/Data/Databases/Items.asset | 185 +++++++++--------- Assets/Content/Data/Databases/Materials.asset | 7 +- .../Data/Databases/ParticlesEffects.asset | 7 +- Assets/Content/Data/Databases/Sounds.asset | 23 +-- .../Content/Data/Databases/WorldSpaceUI.asset | 3 +- Assets/Content/Data/Roles/Assistant.asset | 4 +- .../Roles/Loadouts/AssistantLoadout.asset | 16 +- .../Data/Roles/Loadouts/SecurityLoadout.asset | 12 +- Assets/Content/Data/Roles/Security.asset | 4 +- .../AttackParticles.asset | 4 +- .../WorldObjectAssetReferences/Backpack.asset | 4 +- .../WorldObjectAssetReferences/BikeHorn.asset | 4 +- .../BleedingParticle.asset | 4 +- .../WorldObjectAssetReferences/Boombox.asset | 4 +- .../BrutePatch.asset | 4 +- .../BurnPatch.asset | 4 +- .../ConstructionParticle.asset | 4 +- .../WorldObjectAssetReferences/Crowbar.asset | 4 +- .../DonkPocket.asset | 4 +- .../WorldObjectAssetReferences/Doodad.asset | 4 +- .../ElectricalCable.asset | 4 +- .../ElectricalWire.asset | 4 +- .../FacewearGasMask.asset | 4 +- .../FlashlightBlue.asset | 4 +- .../FloorTile.asset | 4 +- .../GlassReinforcedSheet.asset | 4 +- .../GlassShard.asset | 4 +- .../GlassSheet.asset | 4 +- .../GloveInsulated.asset | 4 +- .../WorldObjectAssetReferences/Hatchet.asset | 4 +- .../WorldObjectAssetReferences/Headset.asset | 4 +- .../HeadsetSecurity.asset | 4 +- .../HealthScanner.asset | 4 +- .../HumanArmLeft.asset | 4 +- .../HumanArmRight.asset | 4 +- .../HumanBrain.asset | 4 +- .../HumanEarLeft.asset | 4 +- .../HumanEarRight.asset | 4 +- .../WorldObjectAssetReferences/HumanEye.asset | 4 +- .../HumanFootLeft.asset | 4 +- .../HumanFootRight.asset | 4 +- .../HumanHandLeft.asset | 4 +- .../HumanHandRight.asset | 4 +- .../HumanHead.asset | 4 +- .../HumanHeart.asset | 4 +- .../HumanIntestineLarge.asset | 4 +- .../HumanIntestineSmall.asset | 4 +- .../HumanLegLeft.asset | 4 +- .../HumanLegRight.asset | 4 +- .../HumanLiver.asset | 4 +- .../HumanLungLeft.asset | 4 +- .../HumanLungRight.asset | 4 +- .../HumanStomach.asset | 4 +- .../HumanTorso.asset | 4 +- .../WorldObjectAssetReferences/IDCard.asset | 4 +- .../JumpsuitBotany.asset | 4 +- .../JumpsuitEngineer.asset | 4 +- .../JumpsuitGrey.asset | 4 +- .../JumpsuitSecurity.asset | 4 +- .../KitchenKnife.asset | 4 +- .../LoadingBar.asset | 4 +- .../MatterBin.asset | 4 +- .../MedicalPatch.asset | 4 +- .../WorldObjectAssetReferences/Medkit.asset | 4 +- .../MicroLaser.asset | 4 +- .../Data/WorldObjectAssetReferences/Mug.asset | 4 +- .../Multitool.asset | 4 +- .../NuclearAuthenticationDisk.asset | 4 +- .../OxygenTank.asset | 4 +- .../Data/WorldObjectAssetReferences/PDA.asset | 4 +- .../PlasmaTank.asset | 4 +- .../WorldObjectAssetReferences/Plenum.asset | 4 +- .../WorldObjectAssetReferences/Poster.asset | 4 +- .../PowerCell.asset | 4 +- .../PowerCellAdmin.asset | 4 +- .../ScrewdriverBlue.asset | 4 +- .../SecurityIDCard.asset | 4 +- .../SecurityPDA.asset | 4 +- .../ShoeHiTops.asset | 4 +- .../ShoeJackboots.asset | 4 +- .../SodaCanBeepsSoda.asset | 4 +- .../SodaCanBeepyLime.asset | 4 +- .../SodaCanCannedAir.asset | 4 +- .../SodaCanCannedLaughter.asset | 4 +- .../SodaCanCola.asset | 4 +- .../SodaCanDukePurpleTea.asset | 4 +- .../SodaCanTonic.asset | 4 +- .../SteelGirder.asset | 4 +- .../SteelGirderUnbolted.asset | 4 +- .../SteelReinforcedSheet.asset | 4 +- .../WorldObjectAssetReferences/SteelRod.asset | 4 +- .../SteelSheet.asset | 4 +- .../SteelWall.asset | 4 +- .../SteelWallReinforced.asset | 4 +- .../SteelWindow.asset | 4 +- .../SteelWindowReinforced.asset | 4 +- .../Sunglasses.asset | 4 +- .../WorldObjectAssetReferences/Toolbelt.asset | 4 +- .../ToolboxBlue.asset | 4 +- .../TruckerCap.asset | 4 +- .../WorldObjectAssetReferences/Welder.asset | 4 +- .../Wirecutters.asset | 4 +- .../WorldObjectAssetReferences/WoodLog.asset | 4 +- .../WoodPlank.asset | 4 +- .../WorldObjectAssetReferences/Wrench.asset | 4 +- 107 files changed, 339 insertions(+), 332 deletions(-) diff --git a/Assets/Content/Data/Databases/CraftingRecipes.asset b/Assets/Content/Data/Databases/CraftingRecipes.asset index bde7d6376b..02f8c697d9 100644 --- a/Assets/Content/Data/Databases/CraftingRecipes.asset +++ b/Assets/Content/Data/Databases/CraftingRecipes.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: CraftingRecipes m_EditorClassIdentifier: DatabaseName: CraftingRecipes + DatabaseID: c8a3b9b514b2f7543a544259c3c97b81 AssetGroup: {fileID: 11400000, guid: ead2cce9e35a7304ab5b8cc67d03347b, type: 2} Assets: _list: - - _key: WeirdComplexRecipe + - _key: 5069902a314070f4ca869692cbc791fa _value: {fileID: 11400000, guid: 5069902a314070f4ca869692cbc791fa, type: 2} - - _key: SteelGirderUnboltedRecipe + - _key: 41ed3a9a199817b47b7ba22ecb7c1ab4 _value: {fileID: 11400000, guid: 41ed3a9a199817b47b7ba22ecb7c1ab4, type: 2} - - _key: SteelSheetRecipe + - _key: b7f1e5d68b05f6743a606736245ff481 _value: {fileID: 11400000, guid: b7f1e5d68b05f6743a606736245ff481, type: 2} - - _key: ReinforcedWallRecipe + - _key: 115e1db3f2858c14fa6b736f67e552be _value: {fileID: 11400000, guid: 115e1db3f2858c14fa6b736f67e552be, type: 2} - - _key: SteelWallRecipe + - _key: 3d6dc37a96797e442bafcb066f1f9aef _value: {fileID: 11400000, guid: 3d6dc37a96797e442bafcb066f1f9aef, type: 2} - - _key: SteelGirderRecipe + - _key: 3decef2c351e13b4194d1994c485a170 _value: {fileID: 11400000, guid: 3decef2c351e13b4194d1994c485a170, type: 2} _new: diff --git a/Assets/Content/Data/Databases/InteractionIcons.asset b/Assets/Content/Data/Databases/InteractionIcons.asset index 24c1c443b9..af86fbdd14 100644 --- a/Assets/Content/Data/Databases/InteractionIcons.asset +++ b/Assets/Content/Data/Databases/InteractionIcons.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: InteractionIcons m_EditorClassIdentifier: DatabaseName: InteractionIcons + DatabaseID: cdf9511d9049fa14ab0433934f3537ec AssetGroup: {fileID: 11400000, guid: 43f5c5834bd38014f9dbacb0f51bcc54, type: 2} Assets: _list: - - _key: Power + - _key: b22067d36fa963b4bbaf8d6085b0ebc9 _value: {fileID: 21300000, guid: b22067d36fa963b4bbaf8d6085b0ebc9, type: 2} - - _key: Take + - _key: 2db953f2ae8f41d4e9842d9144a9e396 _value: {fileID: 21300000, guid: 2db953f2ae8f41d4e9842d9144a9e396, type: 2} - - _key: Open + - _key: 1f97d7fac1be1b448824c85e156d9746 _value: {fileID: 21300000, guid: 1f97d7fac1be1b448824c85e156d9746, type: 2} - - _key: Discard + - _key: e4d142ab75244e24c89d0c2aec36dbed _value: {fileID: 21300000, guid: e4d142ab75244e24c89d0c2aec36dbed, type: 2} - - _key: Honk + - _key: 88c0c549992b597489791caf4a12f18c _value: {fileID: 21300000, guid: 88c0c549992b597489791caf4a12f18c, type: 2} - - _key: Nuke + - _key: 3030468639c4d15459be5f65d30a42df _value: {fileID: 21300000, guid: 3030468639c4d15459be5f65d30a42df, type: 2} _new: diff --git a/Assets/Content/Data/Databases/Items.asset b/Assets/Content/Data/Databases/Items.asset index ef21b70186..22e0d86fa1 100644 --- a/Assets/Content/Data/Databases/Items.asset +++ b/Assets/Content/Data/Databases/Items.asset @@ -13,191 +13,192 @@ MonoBehaviour: m_Name: Items m_EditorClassIdentifier: DatabaseName: Items + DatabaseID: c2644d7b34e956743a0bc485e7ca5e37 AssetGroup: {fileID: 11400000, guid: 8e95016540bf27c4eb11580ec096568a, type: 2} Assets: _list: - - _key: BikeHorn + - _key: 11f824c472e04854e95065dda095e8f4 _value: {fileID: 6891363543938182813, guid: 11f824c472e04854e95065dda095e8f4, type: 3} - - _key: NuclearAuthenticationDisk + - _key: 1ae18785d74e9fa4699b6f6de889c243 _value: {fileID: 6891363543938182813, guid: 1ae18785d74e9fa4699b6f6de889c243, type: 3} - - _key: ToolboxBlue + - _key: 264ea51d92067c14ebc6633999afac78 _value: {fileID: 5533951594911835035, guid: 264ea51d92067c14ebc6633999afac78, type: 3} - - _key: SecurityPDA + - _key: 2a63163a4db141744a802f3ff67087db _value: {fileID: 5261116577612792016, guid: 2a63163a4db141744a802f3ff67087db, type: 3} - - _key: SecurityIDCard + - _key: ff95abc9c2b779340a1b50f1a128a934 _value: {fileID: 5261116577612792016, guid: ff95abc9c2b779340a1b50f1a128a934, type: 3} - - _key: PDA + - _key: 79260483ae5d3e04fa272e092b49abac _value: {fileID: 5261116577612792016, guid: 79260483ae5d3e04fa272e092b49abac, type: 3} - - _key: IDCard + - _key: d8b0c8d1ddcdeb24d9763054c103c9fe _value: {fileID: 5261116577612792016, guid: d8b0c8d1ddcdeb24d9763054c103c9fe, type: 3} - - _key: Mug + - _key: d9aabfd5d726a7f499b8e360d919eba4 _value: {fileID: 5261116577612792016, guid: d9aabfd5d726a7f499b8e360d919eba4, type: 3} - - _key: SodaCanCola + - _key: 92d6696a323ef66448190e8e9d69fd22 _value: {fileID: 3995435954105705608, guid: 92d6696a323ef66448190e8e9d69fd22, type: 3} - - _key: SodaCanCannedLaughter + - _key: dceb056e41b5c634f9933423de8e075c _value: {fileID: 8047892061280000217, guid: dceb056e41b5c634f9933423de8e075c, type: 3} - - _key: SodaCanCannedAir + - _key: e4281cb43d1443d4388737777fdd98d8 _value: {fileID: 5774385816057912484, guid: e4281cb43d1443d4388737777fdd98d8, type: 3} - - _key: SodaCanTonic + - _key: a7c35693adae32f43b4d7fe2eb8b091b _value: {fileID: 2434868383632068905, guid: a7c35693adae32f43b4d7fe2eb8b091b, type: 3} - - _key: SodaCanBeepyLime + - _key: 4e6899916bc8fd742a07f32b3a04de12 _value: {fileID: 6405503896595845848, guid: 4e6899916bc8fd742a07f32b3a04de12, type: 3} - - _key: SodaCanBeepsSoda + - _key: f490a74616c067c4f83995017e10b420 _value: {fileID: 4482577744063562115, guid: f490a74616c067c4f83995017e10b420, type: 3} - - _key: SodaCanDukePurpleTea + - _key: 177428b73bad0fb4a89d1a64b85629bf _value: {fileID: 169984495843080388, guid: 177428b73bad0fb4a89d1a64b85629bf, type: 3} - - _key: Poster + - _key: b044d7bdb55405046a9055726a779eb1 _value: {fileID: 5161561551087789900, guid: b044d7bdb55405046a9055726a779eb1, type: 3} - - _key: MedicalPatch + - _key: 2332a158259900e4f8a237fa8daff266 _value: {fileID: 4068007204767187790, guid: 2332a158259900e4f8a237fa8daff266, type: 3} - - _key: BrutePatch + - _key: b5be0a52925e2674193d081d2deb68cb _value: {fileID: 4068007204767187790, guid: b5be0a52925e2674193d081d2deb68cb, type: 3} - - _key: BurnPatch + - _key: 162e188d33a82b440a239f20901c716a _value: {fileID: 4068007204767187790, guid: 162e188d33a82b440a239f20901c716a, type: 3} - - _key: DonkPocket + - _key: 56b1aff2041026242bed0f064dee56bb _value: {fileID: 3969530706517246485, guid: 56b1aff2041026242bed0f064dee56bb, type: 3} - - _key: Boombox + - _key: 1d2cf546d53e3fe4c9103007427aaec7 _value: {fileID: 8197868818743549203, guid: 1d2cf546d53e3fe4c9103007427aaec7, type: 3} - - _key: FloorTile + - _key: 404443f7c306fc8469698745624fa3bf _value: {fileID: 7125681683583715523, guid: 404443f7c306fc8469698745624fa3bf, type: 3} - - _key: SteelReinforcedSheet + - _key: f88a398ad3d01454f955de9c337d9b99 _value: {fileID: 7125681683583715523, guid: f88a398ad3d01454f955de9c337d9b99, type: 3} - - _key: SteelSheet + - _key: 4cb99cf2fee96f944abbacc51b0b701c _value: {fileID: 7125681683583715523, guid: 4cb99cf2fee96f944abbacc51b0b701c, type: 3} - - _key: Crowbar + - _key: 7becfab153276864f9fc7636a839d837 _value: {fileID: 1888703706215615217, guid: 7becfab153276864f9fc7636a839d837, type: 3} - - _key: ScrewdriverBlue + - _key: 9c8363ee7f934bd4b8ee5a2e30da1269 _value: {fileID: 2402587210622244651, guid: 9c8363ee7f934bd4b8ee5a2e30da1269, type: 3} - - _key: Wrench + - _key: 772da386eb7b01745913050fee544c32 _value: {fileID: 3792017003477948967, guid: 772da386eb7b01745913050fee544c32, type: 3} - - _key: FlashlightBlue + - _key: 781dd9024aaa53444bc3deeaa9708fbb _value: {fileID: 833752496874958856, guid: 781dd9024aaa53444bc3deeaa9708fbb, type: 3} - - _key: KitchenKnife + - _key: 411b513efc8f06a40aecfc47d0c5fc5a _value: {fileID: 3794527162878356835, guid: 411b513efc8f06a40aecfc47d0c5fc5a, type: 3} - - _key: TruckerCap + - _key: 1ef3c21a685ec2d4e9f0876719839d5f _value: {fileID: 2601952054522247362, guid: 1ef3c21a685ec2d4e9f0876719839d5f, type: 3} - - _key: Sunglasses + - _key: 9b9f6bd470226a74b903e74dbe9e423a _value: {fileID: 2667451333340596270, guid: 9b9f6bd470226a74b903e74dbe9e423a, type: 3} - - _key: FacewearGasMask + - _key: bf177f8bab26bc84b87fd9a971004418 _value: {fileID: 1687938131941834081, guid: bf177f8bab26bc84b87fd9a971004418, type: 3} - - _key: HumanArmLeft + - _key: 06b6be83779804245b7f6411fe07b851 _value: {fileID: 1888615333292121711, guid: 06b6be83779804245b7f6411fe07b851, type: 3} - - _key: HumanArmRight + - _key: 432a4ad70e41e5c4f8f913f76fe0e66c _value: {fileID: 832941577213411195, guid: 432a4ad70e41e5c4f8f913f76fe0e66c, type: 3} - - _key: HumanEarLeft + - _key: e02f11b9239b52748a5ed5afd1c5cbd3 _value: {fileID: 3861326785315191697, guid: e02f11b9239b52748a5ed5afd1c5cbd3, type: 3} - - _key: HumanEarRight + - _key: 30794a01d5f4c174a9d20b2c632f2dca _value: {fileID: 3299576395946724586, guid: 30794a01d5f4c174a9d20b2c632f2dca, type: 3} - - _key: HumanFootLeft + - _key: 94aaf82bb6ab002418e01d9cc7c6eaaa _value: {fileID: 6958959792659314810, guid: 94aaf82bb6ab002418e01d9cc7c6eaaa, type: 3} - - _key: HumanFootRight + - _key: e60ba1e09be8316448e419ecbdfb64a6 _value: {fileID: 6632297082311541152, guid: e60ba1e09be8316448e419ecbdfb64a6, type: 3} - - _key: HumanHandLeft + - _key: 35dfc7c3f708a5b48a206b4a44e7ab49 _value: {fileID: 2207730063960764759, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3} - - _key: HumanHandRight + - _key: 7f5954f009d06b2439ca637b43920440 _value: {fileID: 7546631754298856378, guid: 7f5954f009d06b2439ca637b43920440, type: 3} - - _key: HumanHead + - _key: cc54bc74b2f4c2349b1f84b501b0a091 _value: {fileID: 8006468508714419156, guid: cc54bc74b2f4c2349b1f84b501b0a091, type: 3} - - _key: HumanLegLeft + - _key: ecaf79b0a74bdb443a350e88daa94a66 _value: {fileID: 3470038122221450171, guid: ecaf79b0a74bdb443a350e88daa94a66, type: 3} - - _key: HumanTorso + - _key: 4a9d34a6cf84ef045a740513d8ae30b1 _value: {fileID: 5562010227207703736, guid: 4a9d34a6cf84ef045a740513d8ae30b1, type: 3} - - _key: HumanLegRight + - _key: 242a937784a622f4f8a6e6d097e0737c _value: {fileID: 8256619991674398311, guid: 242a937784a622f4f8a6e6d097e0737c, type: 3} - - _key: HumanLungRight + - _key: a8b265034e3f79344a6067b406e1bff6 _value: {fileID: 8304480218026041231, guid: a8b265034e3f79344a6067b406e1bff6, type: 3} - - _key: HumanLungLeft + - _key: a019475d05ec8824494b0fa88e2282d8 _value: {fileID: 1705603677127675533, guid: a019475d05ec8824494b0fa88e2282d8, type: 3} - - _key: HumanStomach + - _key: 2bc6f6a968d5ba04c919ba56d0ccdab4 _value: {fileID: 5774385816057912484, guid: 2bc6f6a968d5ba04c919ba56d0ccdab4, type: 3} - - _key: HumanLiver + - _key: d75ff9a3ac207a84487ec1ee73a676fc _value: {fileID: 5774385816057912484, guid: d75ff9a3ac207a84487ec1ee73a676fc, type: 3} - - _key: HumanIntestineLarge + - _key: 1e304f9a331c2ba419514ef8afb8a13c _value: {fileID: 5774385816057912484, guid: 1e304f9a331c2ba419514ef8afb8a13c, type: 3} - - _key: HumanEye + - _key: 071581df025e1ba49a8a75eb39611ff6 _value: {fileID: 5774385816057912484, guid: 071581df025e1ba49a8a75eb39611ff6, type: 3} - - _key: HumanBrain + - _key: 7579883b8dd8801448a176adace4860b _value: {fileID: 5774385816057912484, guid: 7579883b8dd8801448a176adace4860b, type: 3} - - _key: Toolbelt + - _key: 40d904629802fc942860ce878e78efef _value: {fileID: 1080889307602868191, guid: 40d904629802fc942860ce878e78efef, type: 3} - - _key: Backpack + - _key: ddaa28fac1956b2428aff1dac1d89707 _value: {fileID: 802333698458937824, guid: ddaa28fac1956b2428aff1dac1d89707, type: 3} - - _key: HumanHeart + - _key: fccdc78a6cf916047ba52f2877f755e5 _value: {fileID: 2302397424301738637, guid: fccdc78a6cf916047ba52f2877f755e5, type: 3} - - _key: Doodad + - _key: f6528d8afa18fa14998a0158260ef26c _value: {fileID: 3792017003477948967, guid: f6528d8afa18fa14998a0158260ef26c, type: 3} - - _key: Wirecutters + - _key: 41a1c8c211dc32c4d8ffca5f0892f9dc _value: {fileID: 2402587210622244651, guid: 41a1c8c211dc32c4d8ffca5f0892f9dc, type: 3} - - _key: Multitool + - _key: 2ca5f2886cf2f19428b50bf284689b86 _value: {fileID: 2402587210622244651, guid: 2ca5f2886cf2f19428b50bf284689b86, type: 3} - - _key: PowerCellAdmin + - _key: c69ed93dc225ea049bbf1a02662c48c0 _value: {fileID: 7927487060350510867, guid: c69ed93dc225ea049bbf1a02662c48c0, type: 3} - - _key: PowerCell + - _key: de67200a4c96d444f800399a033ddfef _value: {fileID: 2402587210622244651, guid: de67200a4c96d444f800399a033ddfef, type: 3} - - _key: SteelWall + - _key: 45d13347efae0f54882e0e56dd770bb1 _value: {fileID: 3591147544166670882, guid: 45d13347efae0f54882e0e56dd770bb1, type: 3} - - _key: SteelGirder + - _key: 6c2559c2017ada740b245951a23c2e1d _value: {fileID: 3591147544166670882, guid: 6c2559c2017ada740b245951a23c2e1d, type: 3} - - _key: Plenum + - _key: 3b33b5cf16a677a4e85a110679cde32a _value: {fileID: 8028539322119499722, guid: 3b33b5cf16a677a4e85a110679cde32a, type: 3} - - _key: SteelGirderUnbolted + - _key: 5dba4171f2124fb48b0e32c0e10841e0 _value: {fileID: 3591147544166670882, guid: 5dba4171f2124fb48b0e32c0e10841e0, type: 3} - - _key: GlassReinforcedSheet + - _key: a1a7407e08bb2914c97f431063bf83e2 _value: {fileID: 7125681683583715523, guid: a1a7407e08bb2914c97f431063bf83e2, type: 3} - - _key: GlassSheet + - _key: e2a06f02e6a7e0348bdc535344bfe1f3 _value: {fileID: 7125681683583715523, guid: e2a06f02e6a7e0348bdc535344bfe1f3, type: 3} - - _key: WoodLog + - _key: 2767aeb6e6fd53b43a1cb305789834d4 _value: {fileID: 7125681683583715523, guid: 2767aeb6e6fd53b43a1cb305789834d4, type: 3} - - _key: WoodPlank + - _key: 4aee3fb97a6a2d442804c8c0b8347a92 _value: {fileID: 7125681683583715523, guid: 4aee3fb97a6a2d442804c8c0b8347a92, type: 3} - - _key: SteelRod + - _key: 48fa93e2da7acb3499e400becf2afc26 _value: {fileID: 7125681683583715523, guid: 48fa93e2da7acb3499e400becf2afc26, type: 3} - - _key: Welder + - _key: 06d944205e6b6dd489af078fa85fb878 _value: {fileID: 7393721560307922778, guid: 06d944205e6b6dd489af078fa85fb878, type: 3} - - _key: PlasmaTank + - _key: e3fb39f0a84acf541b6ee828550a1708 _value: {fileID: 7125681683583715523, guid: e3fb39f0a84acf541b6ee828550a1708, type: 3} - - _key: OxygenTank + - _key: 5479411218b869144b7d09d6db6dc58e _value: {fileID: 7125681683583715523, guid: 5479411218b869144b7d09d6db6dc58e, type: 3} - - _key: JumpsuitGrey + - _key: 236b51ddc6f9aa94ca92579082370c06 _value: {fileID: 624365323667193292, guid: 236b51ddc6f9aa94ca92579082370c06, type: 3} - - _key: JumpsuitSecurity + - _key: 93ad90421a3b2f64e8fdb9e95a42ba90 _value: {fileID: 6330158209413936013, guid: 93ad90421a3b2f64e8fdb9e95a42ba90, type: 3} - - _key: JumpsuitBotany + - _key: be3fcf1a74268ad49bfedb1edd9f5318 _value: {fileID: 8312388220934557560, guid: be3fcf1a74268ad49bfedb1edd9f5318, type: 3} - - _key: HumanIntestineSmall + - _key: 9c5418cbebef419429574992d3e296a3 _value: {fileID: 5774385816057912484, guid: 9c5418cbebef419429574992d3e296a3, type: 3} - - _key: GlassShard + - _key: 5cab1a9f6c7f74948b84d0d625319efe _value: {fileID: 7125681683583715523, guid: 5cab1a9f6c7f74948b84d0d625319efe, type: 3} - - _key: JumpsuitEngineer + - _key: 7436f4976849b994aaee40df1bca7d89 _value: {fileID: 4245634344425516727, guid: 7436f4976849b994aaee40df1bca7d89, type: 3} - - _key: MicroLaser + - _key: 84cec183559b4954c883b11f20f767c9 _value: {fileID: 2402587210622244651, guid: 84cec183559b4954c883b11f20f767c9, type: 3} - - _key: MatterBin + - _key: ed77d98d3e75b7946b404face1fe8f82 _value: {fileID: 2402587210622244651, guid: ed77d98d3e75b7946b404face1fe8f82, type: 3} - - _key: Medkit + - _key: 1e64a1c37be1f7c44a5d242d6ec6da10 _value: {fileID: 5533951594911835035, guid: 1e64a1c37be1f7c44a5d242d6ec6da10, type: 3} - - _key: HealthScanner + - _key: e9f99df80a74fd242aa46e53c7ec0376 _value: {fileID: 3794527162878356835, guid: e9f99df80a74fd242aa46e53c7ec0376, type: 3} - - _key: Hatchet + - _key: 9e967cb4084bf064c8a0ca5f57a33b0c _value: {fileID: 2402587210622244651, guid: 9e967cb4084bf064c8a0ca5f57a33b0c, type: 3} - - _key: ElectricalWire + - _key: cc71128d4bcc0c548ac11481000ac424 _value: {fileID: 7125681683583715523, guid: cc71128d4bcc0c548ac11481000ac424, type: 3} - - _key: ElectricalCable + - _key: 0e69918696f58e04f846e985ec7405fe _value: {fileID: 7125681683583715523, guid: 0e69918696f58e04f846e985ec7405fe, type: 3} - - _key: SteelWindow + - _key: b9c224febb4233f4e912745553097652 _value: {fileID: 3591147544166670882, guid: b9c224febb4233f4e912745553097652, type: 3} - - _key: SteelWallReinforced + - _key: abcc60752234e584d8d98c9dec03e7cc _value: {fileID: 3591147544166670882, guid: abcc60752234e584d8d98c9dec03e7cc, type: 3} - - _key: SteelWindowReinforced + - _key: f2493b5478dd8e946ba98861f533362e _value: {fileID: 3591147544166670882, guid: f2493b5478dd8e946ba98861f533362e, type: 3} - - _key: HeadsetSecurity + - _key: a38ee818c953a404787757d8d20d2851 _value: {fileID: 5049739216948387840, guid: a38ee818c953a404787757d8d20d2851, type: 3} - - _key: Headset + - _key: db15899bc1eb2794fb2b24129852a209 _value: {fileID: 8712940276313799639, guid: db15899bc1eb2794fb2b24129852a209, type: 3} - - _key: GloveInsulated + - _key: 65679cf5a30d6dd458666804af7c3ca3 _value: {fileID: 4581819739591165899, guid: 65679cf5a30d6dd458666804af7c3ca3, type: 3} - - _key: ShoeHiTops + - _key: 81faf4debf00a0a478b924176f48d011 _value: {fileID: 930591319891399865, guid: 81faf4debf00a0a478b924176f48d011, type: 3} - - _key: ShoeJackboots + - _key: 535ed7c02b5cbdc43ae2b234a963c5cc _value: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} _new: diff --git a/Assets/Content/Data/Databases/Materials.asset b/Assets/Content/Data/Databases/Materials.asset index b4183d2f1f..d86162248e 100644 --- a/Assets/Content/Data/Databases/Materials.asset +++ b/Assets/Content/Data/Databases/Materials.asset @@ -13,13 +13,14 @@ MonoBehaviour: m_Name: Materials m_EditorClassIdentifier: DatabaseName: Materials + DatabaseID: acbbffb4c89caec469bb21b6197c7626 AssetGroup: {fileID: 11400000, guid: 2caa591261a883b4183d04829ce705fd, type: 2} Assets: _list: - - _key: DeleteConstruction + - _key: ed5a1263eb564c94abc6407ac0919ea7 _value: {fileID: 2100000, guid: ed5a1263eb564c94abc6407ac0919ea7, type: 2} - - _key: InvalidConstruction + - _key: e9b99cfb2e59ffa40a062c2f4b88b729 _value: {fileID: 2100000, guid: e9b99cfb2e59ffa40a062c2f4b88b729, type: 2} - - _key: ValidConstruction + - _key: 6d2a18aa72cbaf94694dce9f8451160b _value: {fileID: 2100000, guid: 6d2a18aa72cbaf94694dce9f8451160b, type: 2} _new: diff --git a/Assets/Content/Data/Databases/ParticlesEffects.asset b/Assets/Content/Data/Databases/ParticlesEffects.asset index 7ea24935f7..9b7ad69141 100644 --- a/Assets/Content/Data/Databases/ParticlesEffects.asset +++ b/Assets/Content/Data/Databases/ParticlesEffects.asset @@ -13,13 +13,14 @@ MonoBehaviour: m_Name: ParticlesEffects m_EditorClassIdentifier: DatabaseName: ParticlesEffects + DatabaseID: 099b9943e9299d54b82d2c1163500458 AssetGroup: {fileID: 11400000, guid: d700978032e12a647b8734863a0bf7c2, type: 2} Assets: _list: - - _key: AttackParticles + - _key: 17b0d9163e9cdf14aa557557e7d9d76b _value: {fileID: 7714517724079113232, guid: 17b0d9163e9cdf14aa557557e7d9d76b, type: 3} - - _key: BleedingParticle + - _key: a6a77c26ee7edd94c804f4ddd851c8ba _value: {fileID: 6016476664605660376, guid: a6a77c26ee7edd94c804f4ddd851c8ba, type: 3} - - _key: ConstructionParticle + - _key: ca5e6b5f7c6c5054a8f8155ef44e3e43 _value: {fileID: 9126258469831405173, guid: ca5e6b5f7c6c5054a8f8155ef44e3e43, type: 3} _new: diff --git a/Assets/Content/Data/Databases/Sounds.asset b/Assets/Content/Data/Databases/Sounds.asset index 0a1a8ed441..069bcbf765 100644 --- a/Assets/Content/Data/Databases/Sounds.asset +++ b/Assets/Content/Data/Databases/Sounds.asset @@ -13,29 +13,30 @@ MonoBehaviour: m_Name: Sounds m_EditorClassIdentifier: DatabaseName: Sounds + DatabaseID: 43b69e36c49203a44bf20042cd83de81 AssetGroup: {fileID: 11400000, guid: d640c8e212e7a5349999a9ddd6ffb5b5, type: 2} Assets: _list: - - _key: BikeHorn + - _key: 8c8823796bbcb23438fcf68260070383 _value: {fileID: 8300000, guid: 8c8823796bbcb23438fcf68260070383, type: 3} - - _key: Title1 + - _key: ec8b849764a7e9147b2a565f81a1ca42 _value: {fileID: 8300000, guid: ec8b849764a7e9147b2a565f81a1ca42, type: 3} - - _key: Title2 + - _key: 3f51862f0b88a5243a8cceb97147489d _value: {fileID: 8300000, guid: 3f51862f0b88a5243a8cceb97147489d, type: 3} - - _key: Title3 + - _key: fd331e360db5fbb448e66367e41d1893 _value: {fileID: 8300000, guid: fd331e360db5fbb448e66367e41d1893, type: 3} - - _key: Can1 + - _key: 1a34c805f84be3b4caac14d7de790607 _value: {fileID: 8300000, guid: 1a34c805f84be3b4caac14d7de790607, type: 3} - - _key: Can2 + - _key: 8d93fdf9dcada204a952e29213f0293f _value: {fileID: 8300000, guid: 8d93fdf9dcada204a952e29213f0293f, type: 3} - - _key: Can3 + - _key: b315c4abdef36244fb211c5f643d411a _value: {fileID: 8300000, guid: b315c4abdef36244fb211c5f643d411a, type: 3} - - _key: Can4 + - _key: f00c6b5a098e84b4b87d80d23b4f295a _value: {fileID: 8300000, guid: f00c6b5a098e84b4b87d80d23b4f295a, type: 3} - - _key: AirlockClose + - _key: fc2485e75c5d3ab4e86e814043c9e9cb _value: {fileID: 8300000, guid: fc2485e75c5d3ab4e86e814043c9e9cb, type: 3} - - _key: AirlockOpen + - _key: 34297ba204a9f3944872f100baaa2369 _value: {fileID: 8300000, guid: 34297ba204a9f3944872f100baaa2369, type: 3} - - _key: FuelPowerGenerator + - _key: 59b65ecaf8dffbf49876ab2768490b59 _value: {fileID: 8300000, guid: 59b65ecaf8dffbf49876ab2768490b59, type: 3} _new: diff --git a/Assets/Content/Data/Databases/WorldSpaceUI.asset b/Assets/Content/Data/Databases/WorldSpaceUI.asset index bb5ead4974..4055595dd7 100644 --- a/Assets/Content/Data/Databases/WorldSpaceUI.asset +++ b/Assets/Content/Data/Databases/WorldSpaceUI.asset @@ -13,9 +13,10 @@ MonoBehaviour: m_Name: WorldSpaceUI m_EditorClassIdentifier: DatabaseName: WorldSpaceUI + DatabaseID: 830650063081cdf4d90087fc2ac74d24 AssetGroup: {fileID: 11400000, guid: dd394b793b56e43418a2c11a61130663, type: 2} Assets: _list: - - _key: LoadingBar + - _key: 03bcc1824d3b20748b912ca532f86bb9 _value: {fileID: 1998198171871307260, guid: 03bcc1824d3b20748b912ca532f86bb9, type: 3} _new: diff --git a/Assets/Content/Data/Roles/Assistant.asset b/Assets/Content/Data/Roles/Assistant.asset index 1fa6f33e8e..3c8f38810c 100644 --- a/Assets/Content/Data/Roles/Assistant.asset +++ b/Assets/Content/Data/Roles/Assistant.asset @@ -13,8 +13,8 @@ MonoBehaviour: m_Name: Assistant m_EditorClassIdentifier: _roleName: Assistant - _pdaPrefab: {fileID: 5261116577612792016, guid: 2a63163a4db141744a802f3ff67087db, type: 3} - _idCardPrefab: {fileID: 5261116577612792016, guid: ff95abc9c2b779340a1b50f1a128a934, type: 3} + _pdaAsset: {fileID: 11400000, guid: 4f09dc7f882c18542b750da80a29720f, type: 2} + _idCardAsset: {fileID: 11400000, guid: bca8d36802b3dbc47bc479151a3f7ea1, type: 2} _permissions: - {fileID: 11400000, guid: 921240e0c27686d4eaf2ff761944c5eb, type: 2} _loadout: {fileID: 11400000, guid: 5db09cbd548ecf34f97473fb3898e95e, type: 2} diff --git a/Assets/Content/Data/Roles/Loadouts/AssistantLoadout.asset b/Assets/Content/Data/Roles/Loadouts/AssistantLoadout.asset index 4bd6002105..4465471d69 100644 --- a/Assets/Content/Data/Roles/Loadouts/AssistantLoadout.asset +++ b/Assets/Content/Data/Roles/Loadouts/AssistantLoadout.asset @@ -12,18 +12,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fbd6da0c74d76746b141068081e0dc3, type: 3} m_Name: AssistantLoadout m_EditorClassIdentifier: - HandLeft: {fileID: 5533951594911835035, guid: 264ea51d92067c14ebc6633999afac78, type: 3} - HandRight: {fileID: 0} - Equipment: + HandLeftAsset: {fileID: 11400000, guid: 734468cf273e2144d945698e4793b7c5, type: 2} + HandRightAsset: {fileID: 0} + EquipmentAssets: _list: - _key: 512 - _value: {fileID: 624365323667193292, guid: 236b51ddc6f9aa94ca92579082370c06, type: 3} + _value: {fileID: 11400000, guid: 620dc53a5608be44a975c990e69ddba5, type: 2} - _key: 16 - _value: {fileID: 6003340987905195654, guid: 5fa15d6fdef93dc4e80d798cefe8be0b, type: 3} + _value: {fileID: 0} - _key: 32 - _value: {fileID: 930591319891399865, guid: 317ec7dcff3b11d4eae3a47929200b93, type: 3} + _value: {fileID: 0} - _key: 2048 - _value: {fileID: 4581819739591165899, guid: 65679cf5a30d6dd458666804af7c3ca3, type: 3} + _value: {fileID: 11400000, guid: 55deb25596d5d314b8b7dd58eafb8aec, type: 2} - _key: 4096 - _value: {fileID: 4581819739591165899, guid: 65679cf5a30d6dd458666804af7c3ca3, type: 3} + _value: {fileID: 11400000, guid: 55deb25596d5d314b8b7dd58eafb8aec, type: 2} _new: 0 diff --git a/Assets/Content/Data/Roles/Loadouts/SecurityLoadout.asset b/Assets/Content/Data/Roles/Loadouts/SecurityLoadout.asset index 8f9c04c3d6..6a2dee2db5 100644 --- a/Assets/Content/Data/Roles/Loadouts/SecurityLoadout.asset +++ b/Assets/Content/Data/Roles/Loadouts/SecurityLoadout.asset @@ -12,14 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fbd6da0c74d76746b141068081e0dc3, type: 3} m_Name: SecurityLoadout m_EditorClassIdentifier: - HandLeft: {fileID: 8197868818743549203, guid: 1d2cf546d53e3fe4c9103007427aaec7, type: 3} - HandRight: {fileID: 0} - Equipment: + HandLeftAsset: {fileID: 11400000, guid: d81d46f903aad014aa4728a8b47ab7ea, type: 2} + HandRightAsset: {fileID: 0} + EquipmentAssets: _list: - _key: 512 - _value: {fileID: 624365323667193292, guid: 236b51ddc6f9aa94ca92579082370c06, type: 3} + _value: {fileID: 11400000, guid: 620dc53a5608be44a975c990e69ddba5, type: 2} - _key: 16 - _value: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} + _value: {fileID: 11400000, guid: 7514f2bc5fd84a14095929761da0a4dd, type: 2} - _key: 32 - _value: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} + _value: {fileID: 11400000, guid: 7514f2bc5fd84a14095929761da0a4dd, type: 2} _new: 0 diff --git a/Assets/Content/Data/Roles/Security.asset b/Assets/Content/Data/Roles/Security.asset index a0cf26684f..e410b68a42 100644 --- a/Assets/Content/Data/Roles/Security.asset +++ b/Assets/Content/Data/Roles/Security.asset @@ -13,8 +13,8 @@ MonoBehaviour: m_Name: Security m_EditorClassIdentifier: _roleName: Security - _pdaPrefab: {fileID: 5261116577612792016, guid: 79260483ae5d3e04fa272e092b49abac, type: 3} - _idCardPrefab: {fileID: 5261116577612792016, guid: d8b0c8d1ddcdeb24d9763054c103c9fe, type: 3} + _pdaAsset: {fileID: 11400000, guid: 4773cbe0a88c809459547e0d0eff8d29, type: 2} + _idCardAsset: {fileID: 11400000, guid: d4a76ab7d8dbea34cb528fc2b784fd70, type: 2} _permissions: - {fileID: 11400000, guid: 921240e0c27686d4eaf2ff761944c5eb, type: 2} - {fileID: 11400000, guid: 6f6e80ff9f87f7e4d810b2e9dcb013df, type: 2} diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset b/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset index 23c97a15eb..9860062ae2 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: AttackParticles m_EditorClassIdentifier: - Id: AttackParticles - Database: ParticlesEffects + Id: 17b0d9163e9cdf14aa557557e7d9d76b + Database: 099b9943e9299d54b82d2c1163500458 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset b/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset index 63a7906cf5..f9878d4de9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Backpack m_EditorClassIdentifier: - Id: Backpack - Database: Items + Id: ddaa28fac1956b2428aff1dac1d89707 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset b/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset index f9fd133c1e..3804b568c9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: BikeHorn m_EditorClassIdentifier: - Id: BikeHorn - Database: Items + Id: 11f824c472e04854e95065dda095e8f4 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset b/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset index 280dba0a65..0221020758 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: BleedingParticle m_EditorClassIdentifier: - Id: BleedingParticle - Database: ParticlesEffects + Id: a6a77c26ee7edd94c804f4ddd851c8ba + Database: 099b9943e9299d54b82d2c1163500458 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset b/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset index ff4c1d6b63..b2b9499d27 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Boombox m_EditorClassIdentifier: - Id: Boombox - Database: Items + Id: 1d2cf546d53e3fe4c9103007427aaec7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset b/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset index 0efc57064b..23d1c331c3 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: BrutePatch m_EditorClassIdentifier: - Id: BrutePatch - Database: Items + Id: b5be0a52925e2674193d081d2deb68cb + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset b/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset index a8ba9ff89e..74b8e114f5 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: BurnPatch m_EditorClassIdentifier: - Id: BurnPatch - Database: Items + Id: 162e188d33a82b440a239f20901c716a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset b/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset index 5e9a0be325..8867836a66 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ConstructionParticle m_EditorClassIdentifier: - Id: ConstructionParticle - Database: ParticlesEffects + Id: ca5e6b5f7c6c5054a8f8155ef44e3e43 + Database: 099b9943e9299d54b82d2c1163500458 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset b/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset index 0f5f70b711..cdef477070 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Crowbar m_EditorClassIdentifier: - Id: Crowbar - Database: Items + Id: 7becfab153276864f9fc7636a839d837 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset b/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset index 65a33b9f0c..2cd1e794fd 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: DonkPocket m_EditorClassIdentifier: - Id: DonkPocket - Database: Items + Id: 56b1aff2041026242bed0f064dee56bb + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset b/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset index e82026634c..b3c3e90b7a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Doodad m_EditorClassIdentifier: - Id: Doodad - Database: Items + Id: f6528d8afa18fa14998a0158260ef26c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset b/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset index 8a50e187ca..b4be80ba0d 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ElectricalCable m_EditorClassIdentifier: - Id: ElectricalCable - Database: Items + Id: 0e69918696f58e04f846e985ec7405fe + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset b/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset index fa08374ee3..9b6758ff50 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ElectricalWire m_EditorClassIdentifier: - Id: ElectricalWire - Database: Items + Id: cc71128d4bcc0c548ac11481000ac424 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset b/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset index f23b2967fc..21661b8478 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: FacewearGasMask m_EditorClassIdentifier: - Id: FacewearGasMask - Database: Items + Id: bf177f8bab26bc84b87fd9a971004418 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset index 9c84be4ebe..4fc9dd29d6 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: FlashlightBlue m_EditorClassIdentifier: - Id: FlashlightBlue - Database: Items + Id: 781dd9024aaa53444bc3deeaa9708fbb + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset b/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset index f9f41cda7b..5087352918 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: FloorTile m_EditorClassIdentifier: - Id: FloorTile - Database: Items + Id: 404443f7c306fc8469698745624fa3bf + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset b/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset index 61ac090c97..2624297d45 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: GlassReinforcedSheet m_EditorClassIdentifier: - Id: GlassReinforcedSheet - Database: Items + Id: a1a7407e08bb2914c97f431063bf83e2 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset b/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset index 95ff84f3a1..60d0f16a84 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: GlassShard m_EditorClassIdentifier: - Id: GlassShard - Database: Items + Id: 5cab1a9f6c7f74948b84d0d625319efe + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset b/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset index 8f82f6f7b1..9a0c593817 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: GlassSheet m_EditorClassIdentifier: - Id: GlassSheet - Database: Items + Id: e2a06f02e6a7e0348bdc535344bfe1f3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset b/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset index a8447acd38..c436dc3d83 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: GloveInsulated m_EditorClassIdentifier: - Id: GloveInsulated - Database: Items + Id: 65679cf5a30d6dd458666804af7c3ca3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset b/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset index a0f1eb66e1..2a8a2355ee 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Hatchet m_EditorClassIdentifier: - Id: Hatchet - Database: Items + Id: 9e967cb4084bf064c8a0ca5f57a33b0c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset b/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset index 5ddfe16e13..0e6779c55f 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Headset m_EditorClassIdentifier: - Id: Headset - Database: Items + Id: db15899bc1eb2794fb2b24129852a209 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset b/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset index db3ffa706f..44a8edcba5 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HeadsetSecurity m_EditorClassIdentifier: - Id: HeadsetSecurity - Database: Items + Id: a38ee818c953a404787757d8d20d2851 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset b/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset index 5f285d9840..922c8cd564 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HealthScanner m_EditorClassIdentifier: - Id: HealthScanner - Database: Items + Id: e9f99df80a74fd242aa46e53c7ec0376 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset index afec869cd4..f1a117d87e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanArmLeft m_EditorClassIdentifier: - Id: HumanArmLeft - Database: Items + Id: 06b6be83779804245b7f6411fe07b851 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset index ccb75ddae5..6bb6b9ce9e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanArmRight m_EditorClassIdentifier: - Id: HumanArmRight - Database: Items + Id: 432a4ad70e41e5c4f8f913f76fe0e66c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset index 039f6ca27b..fd54f6f93e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanBrain m_EditorClassIdentifier: - Id: HumanBrain - Database: Items + Id: 7579883b8dd8801448a176adace4860b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset index f0711f986b..f73344e923 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanEarLeft m_EditorClassIdentifier: - Id: HumanEarLeft - Database: Items + Id: e02f11b9239b52748a5ed5afd1c5cbd3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset index 28ae2a9d30..37dfa923fb 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanEarRight m_EditorClassIdentifier: - Id: HumanEarRight - Database: Items + Id: 30794a01d5f4c174a9d20b2c632f2dca + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset index b123a96ebc..ac28b82d24 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanEye m_EditorClassIdentifier: - Id: HumanEye - Database: Items + Id: 071581df025e1ba49a8a75eb39611ff6 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset index 6b830cb663..90933aaae8 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanFootLeft m_EditorClassIdentifier: - Id: HumanFootLeft - Database: Items + Id: 94aaf82bb6ab002418e01d9cc7c6eaaa + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset index 59e72ea3a1..a0c13ff67c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanFootRight m_EditorClassIdentifier: - Id: HumanFootRight - Database: Items + Id: e60ba1e09be8316448e419ecbdfb64a6 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset index 5e36e9d9a3..2cd5def074 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanHandLeft m_EditorClassIdentifier: - Id: HumanHandLeft - Database: Items + Id: 35dfc7c3f708a5b48a206b4a44e7ab49 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset index 304fe58984..5736c97dfb 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanHandRight m_EditorClassIdentifier: - Id: HumanHandRight - Database: Items + Id: 7f5954f009d06b2439ca637b43920440 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset index 3658260799..ae9343115d 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanHead m_EditorClassIdentifier: - Id: HumanHead - Database: Items + Id: cc54bc74b2f4c2349b1f84b501b0a091 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset index 003cb0b298..7476985f1d 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanHeart m_EditorClassIdentifier: - Id: HumanHeart - Database: Items + Id: fccdc78a6cf916047ba52f2877f755e5 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset index eea72af90e..2c821e4313 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanIntestineLarge m_EditorClassIdentifier: - Id: HumanIntestineLarge - Database: Items + Id: 1e304f9a331c2ba419514ef8afb8a13c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset index a168c3986c..e52592730a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanIntestineSmall m_EditorClassIdentifier: - Id: HumanIntestineSmall - Database: Items + Id: 9c5418cbebef419429574992d3e296a3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset index e27bd98c49..a3932977a9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLegLeft m_EditorClassIdentifier: - Id: HumanLegLeft - Database: Items + Id: ecaf79b0a74bdb443a350e88daa94a66 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset index beb1a64456..1b11c420ca 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLegRight m_EditorClassIdentifier: - Id: HumanLegRight - Database: Items + Id: 242a937784a622f4f8a6e6d097e0737c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset index 38163e511e..9092714b85 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLiver m_EditorClassIdentifier: - Id: HumanLiver - Database: Items + Id: d75ff9a3ac207a84487ec1ee73a676fc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset index 8fe274f469..0b1d49f0fb 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLungLeft m_EditorClassIdentifier: - Id: HumanLungLeft - Database: Items + Id: a019475d05ec8824494b0fa88e2282d8 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset index 14c37c0f2d..cb5329f29e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLungRight m_EditorClassIdentifier: - Id: HumanLungRight - Database: Items + Id: a8b265034e3f79344a6067b406e1bff6 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset index c3d54065fd..af3bf0e802 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanStomach m_EditorClassIdentifier: - Id: HumanStomach - Database: Items + Id: 2bc6f6a968d5ba04c919ba56d0ccdab4 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset index 6b8f71367f..ac939e883e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanTorso m_EditorClassIdentifier: - Id: HumanTorso - Database: Items + Id: 4a9d34a6cf84ef045a740513d8ae30b1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset b/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset index 885e41126f..97cd875dd2 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: IDCard m_EditorClassIdentifier: - Id: IDCard - Database: Items + Id: d8b0c8d1ddcdeb24d9763054c103c9fe + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset index f5b59f594e..128352d080 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: JumpsuitBotany m_EditorClassIdentifier: - Id: JumpsuitBotany - Database: Items + Id: be3fcf1a74268ad49bfedb1edd9f5318 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset index 6f7a00648b..cafd2d87a0 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: JumpsuitEngineer m_EditorClassIdentifier: - Id: JumpsuitEngineer - Database: Items + Id: 7436f4976849b994aaee40df1bca7d89 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset index 04574d540a..844bb05e19 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: JumpsuitGrey m_EditorClassIdentifier: - Id: JumpsuitGrey - Database: Items + Id: 236b51ddc6f9aa94ca92579082370c06 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset index 61142149ba..10de8fb3fa 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: JumpsuitSecurity m_EditorClassIdentifier: - Id: JumpsuitSecurity - Database: Items + Id: 93ad90421a3b2f64e8fdb9e95a42ba90 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset b/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset index 9d68fb0950..38aff79a86 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: KitchenKnife m_EditorClassIdentifier: - Id: KitchenKnife - Database: Items + Id: 411b513efc8f06a40aecfc47d0c5fc5a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset b/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset index 9f056f5031..e9e41ffa1c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: LoadingBar m_EditorClassIdentifier: - Id: LoadingBar - Database: WorldSpaceUI + Id: 03bcc1824d3b20748b912ca532f86bb9 + Database: 830650063081cdf4d90087fc2ac74d24 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset b/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset index e7d88ddbf2..f02c79dd8e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: MatterBin m_EditorClassIdentifier: - Id: MatterBin - Database: Items + Id: ed77d98d3e75b7946b404face1fe8f82 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset b/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset index bef782a656..6590be503d 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: MedicalPatch m_EditorClassIdentifier: - Id: MedicalPatch - Database: Items + Id: 2332a158259900e4f8a237fa8daff266 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset b/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset index 59be73132a..2275147449 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Medkit m_EditorClassIdentifier: - Id: Medkit - Database: Items + Id: 1e64a1c37be1f7c44a5d242d6ec6da10 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset b/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset index 6f1ab169aa..6f044144c9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: MicroLaser m_EditorClassIdentifier: - Id: MicroLaser - Database: Items + Id: 84cec183559b4954c883b11f20f767c9 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset b/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset index aa04f3d969..ffc349c425 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Mug m_EditorClassIdentifier: - Id: Mug - Database: Items + Id: d9aabfd5d726a7f499b8e360d919eba4 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset b/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset index 9e6f88019b..207f652305 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Multitool m_EditorClassIdentifier: - Id: Multitool - Database: Items + Id: 2ca5f2886cf2f19428b50bf284689b86 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset b/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset index c0d751168a..92ba6a075c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: NuclearAuthenticationDisk m_EditorClassIdentifier: - Id: NuclearAuthenticationDisk - Database: Items + Id: 1ae18785d74e9fa4699b6f6de889c243 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset b/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset index 80bc0fec1c..fedc2bfd1c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: OxygenTank m_EditorClassIdentifier: - Id: OxygenTank - Database: Items + Id: 5479411218b869144b7d09d6db6dc58e + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset b/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset index 3859976b65..a41548f2ce 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: PDA m_EditorClassIdentifier: - Id: PDA - Database: Items + Id: 79260483ae5d3e04fa272e092b49abac + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset b/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset index 8f97cf9996..c64b03aab0 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: PlasmaTank m_EditorClassIdentifier: - Id: PlasmaTank - Database: Items + Id: e3fb39f0a84acf541b6ee828550a1708 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset b/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset index 0b8114d471..7c4c1d8fdd 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Plenum m_EditorClassIdentifier: - Id: Plenum - Database: Items + Id: 3b33b5cf16a677a4e85a110679cde32a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset b/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset index 8229464a46..8390642f52 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Poster m_EditorClassIdentifier: - Id: Poster - Database: Items + Id: b044d7bdb55405046a9055726a779eb1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset b/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset index b33a287d0a..032759dbf7 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: PowerCell m_EditorClassIdentifier: - Id: PowerCell - Database: Items + Id: de67200a4c96d444f800399a033ddfef + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset index 355bac5fdf..1719640dc3 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: PowerCellAdmin m_EditorClassIdentifier: - Id: PowerCellAdmin - Database: Items + Id: c69ed93dc225ea049bbf1a02662c48c0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset index 232e54630b..32784b2c5a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ScrewdriverBlue m_EditorClassIdentifier: - Id: ScrewdriverBlue - Database: Items + Id: 9c8363ee7f934bd4b8ee5a2e30da1269 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset b/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset index 30de5d5e20..d929f94b18 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SecurityIDCard m_EditorClassIdentifier: - Id: SecurityIDCard - Database: Items + Id: ff95abc9c2b779340a1b50f1a128a934 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset b/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset index 4bba12839e..d6370d3cf5 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SecurityPDA m_EditorClassIdentifier: - Id: SecurityPDA - Database: Items + Id: 2a63163a4db141744a802f3ff67087db + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset b/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset index cde406ba96..af3b50b085 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ShoeHiTops m_EditorClassIdentifier: - Id: ShoeHiTops - Database: Items + Id: 81faf4debf00a0a478b924176f48d011 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset b/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset index 6fc128c8ca..e826d99435 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ShoeJackboots m_EditorClassIdentifier: - Id: ShoeJackboots - Database: Items + Id: 535ed7c02b5cbdc43ae2b234a963c5cc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset index e9d92f4692..7a57114807 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanBeepsSoda m_EditorClassIdentifier: - Id: SodaCanBeepsSoda - Database: Items + Id: f490a74616c067c4f83995017e10b420 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset index 19dba3b2d9..128f681985 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanBeepyLime m_EditorClassIdentifier: - Id: SodaCanBeepyLime - Database: Items + Id: 4e6899916bc8fd742a07f32b3a04de12 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset index 0da19ffabe..9dbebb707c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanCannedAir m_EditorClassIdentifier: - Id: SodaCanCannedAir - Database: Items + Id: e4281cb43d1443d4388737777fdd98d8 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset index b603e8ff15..61f82e5a43 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanCannedLaughter m_EditorClassIdentifier: - Id: SodaCanCannedLaughter - Database: Items + Id: dceb056e41b5c634f9933423de8e075c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset index c520aeb465..86832f57f7 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanCola m_EditorClassIdentifier: - Id: SodaCanCola - Database: Items + Id: 92d6696a323ef66448190e8e9d69fd22 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset index 1ca5f38a04..443d58d21a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanDukePurpleTea m_EditorClassIdentifier: - Id: SodaCanDukePurpleTea - Database: Items + Id: 177428b73bad0fb4a89d1a64b85629bf + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset index 7c44577f01..bfcf797d06 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanTonic m_EditorClassIdentifier: - Id: SodaCanTonic - Database: Items + Id: a7c35693adae32f43b4d7fe2eb8b091b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset index 26f9f3036e..df561cda9c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelGirder m_EditorClassIdentifier: - Id: SteelGirder - Database: Items + Id: 6c2559c2017ada740b245951a23c2e1d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset index d2f163e741..be5edf0373 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelGirderUnbolted m_EditorClassIdentifier: - Id: SteelGirderUnbolted - Database: Items + Id: 5dba4171f2124fb48b0e32c0e10841e0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset index 531d1e0fb7..f0b0b6db7a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelReinforcedSheet m_EditorClassIdentifier: - Id: SteelReinforcedSheet - Database: Items + Id: f88a398ad3d01454f955de9c337d9b99 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset index 4b3552e5e3..78de8806ba 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelRod m_EditorClassIdentifier: - Id: SteelRod - Database: Items + Id: 48fa93e2da7acb3499e400becf2afc26 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset index 7618cc42bf..5cab587832 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelSheet m_EditorClassIdentifier: - Id: SteelSheet - Database: Items + Id: 4cb99cf2fee96f944abbacc51b0b701c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset index 05cc52974d..63b42b53dd 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelWall m_EditorClassIdentifier: - Id: SteelWall - Database: Items + Id: 45d13347efae0f54882e0e56dd770bb1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset index 7f29112d85..b6aec5625b 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelWallReinforced m_EditorClassIdentifier: - Id: SteelWallReinforced - Database: Items + Id: abcc60752234e584d8d98c9dec03e7cc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset index ff9af43bdc..21f63e67a9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelWindow m_EditorClassIdentifier: - Id: SteelWindow - Database: Items + Id: b9c224febb4233f4e912745553097652 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset index 5761dcf824..41694ea843 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelWindowReinforced m_EditorClassIdentifier: - Id: SteelWindowReinforced - Database: Items + Id: f2493b5478dd8e946ba98861f533362e + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset b/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset index e7928e8ecd..3341624915 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Sunglasses m_EditorClassIdentifier: - Id: Sunglasses - Database: Items + Id: 9b9f6bd470226a74b903e74dbe9e423a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset b/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset index ba4d490504..27f95f1863 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Toolbelt m_EditorClassIdentifier: - Id: Toolbelt - Database: Items + Id: 40d904629802fc942860ce878e78efef + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset index e6fde2669e..4e29fffc4b 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ToolboxBlue m_EditorClassIdentifier: - Id: ToolboxBlue - Database: Items + Id: 264ea51d92067c14ebc6633999afac78 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset b/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset index f131902ee1..b1b997ab82 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: TruckerCap m_EditorClassIdentifier: - Id: TruckerCap - Database: Items + Id: 1ef3c21a685ec2d4e9f0876719839d5f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset b/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset index bc1c0f8736..f5c33e4057 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Welder m_EditorClassIdentifier: - Id: Welder - Database: Items + Id: 06d944205e6b6dd489af078fa85fb878 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset b/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset index 5335f85a34..d9106d7491 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Wirecutters m_EditorClassIdentifier: - Id: Wirecutters - Database: Items + Id: 41a1c8c211dc32c4d8ffca5f0892f9dc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset b/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset index eecbb8b2e7..ffaf918a63 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: WoodLog m_EditorClassIdentifier: - Id: WoodLog - Database: Items + Id: 2767aeb6e6fd53b43a1cb305789834d4 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset b/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset index 6183582c2a..29c43cc052 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: WoodPlank m_EditorClassIdentifier: - Id: WoodPlank - Database: Items + Id: 4aee3fb97a6a2d442804c8c0b8347a92 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset b/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset index a1b5fc7ca0..74d8d9c18e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Wrench m_EditorClassIdentifier: - Id: Wrench - Database: Items + Id: 772da386eb7b01745913050fee544c32 + Database: c2644d7b34e956743a0bc485e7ca5e37 From 7c952e50096726f69297626d8a990ec58c4a7a87 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Mon, 2 Feb 2026 16:38:47 -0500 Subject: [PATCH 11/54] Add new asset files and update prefab references for audio management --- .../WorldObjectAssetReferences/Can1.asset | 16 ++++++ .../Can1.asset.meta | 8 +++ .../WorldObjectAssetReferences/Can2.asset | 16 ++++++ .../Can2.asset.meta | 8 +++ .../WorldObjectAssetReferences/Can3.asset | 16 ++++++ .../Can3.asset.meta | 8 +++ .../WorldObjectAssetReferences/Can4.asset | 16 ++++++ .../Can4.asset.meta | 8 +++ .../WorldObjectAssetReferences/Title1.asset | 16 ++++++ .../Title1.asset.meta | 8 +++ .../WorldObjectAssetReferences/Title2.asset | 16 ++++++ .../Title2.asset.meta | 8 +++ .../WorldObjectAssetReferences/Title3.asset | 16 ++++++ .../Title3.asset.meta | 8 +++ .../Furniture/Generic/JukeboxBlueGreen.prefab | 10 ++-- .../Food/Drinks/Soda/SodaCanGeneric.prefab | 6 +++ .../WorldObjectAssetReference.cs | 36 +++++++++++++- .../SS3D/Systems/Audio/AudioSubSystem.cs | 49 ++++++++++++++++--- Assets/Scripts/SS3D/Systems/Audio/Boombox.cs | 9 ++-- .../SS3D/Systems/Audio/NoisyCollision.cs | 33 ++++++++----- .../Systems/Electricity/FuelPowerGenerator.cs | 3 +- .../Systems/Furniture/AirlockStateMachine.cs | 6 +-- .../SS3D/Systems/Furniture/VendingMachine.cs | 6 +-- .../Inventory/Items/Generic/BikeHorn.cs | 3 +- 24 files changed, 289 insertions(+), 40 deletions(-) create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can1.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can2.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can3.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can4.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title1.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title2.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title3.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset b/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset new file mode 100644 index 0000000000..198a494a11 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Can1 + m_EditorClassIdentifier: + Id: 1a34c805f84be3b4caac14d7de790607 + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta new file mode 100644 index 0000000000..0099d65304 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a018567162ec7ad40bdd2d7d8ae6074b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset b/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset new file mode 100644 index 0000000000..0f3cd2d812 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Can2 + m_EditorClassIdentifier: + Id: 8d93fdf9dcada204a952e29213f0293f + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta new file mode 100644 index 0000000000..d29b2da515 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d6d1f8ffca30774e8791de6a68f2d97 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset b/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset new file mode 100644 index 0000000000..e92ed62491 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Can3 + m_EditorClassIdentifier: + Id: b315c4abdef36244fb211c5f643d411a + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta new file mode 100644 index 0000000000..8ff93733fa --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b30cc2cc7d13a7f459a5911da388787f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset b/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset new file mode 100644 index 0000000000..9a061f1f1e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Can4 + m_EditorClassIdentifier: + Id: f00c6b5a098e84b4b87d80d23b4f295a + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta new file mode 100644 index 0000000000..864bfc17a2 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4cac36cceddb62f4c914372c095706e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset b/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset new file mode 100644 index 0000000000..8f9fc16c93 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Title1 + m_EditorClassIdentifier: + Id: ec8b849764a7e9147b2a565f81a1ca42 + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta new file mode 100644 index 0000000000..e0b22dd52e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25feb284497d72e419a785e18fd7e290 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset b/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset new file mode 100644 index 0000000000..a2a2afbde0 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Title2 + m_EditorClassIdentifier: + Id: 3f51862f0b88a5243a8cceb97147489d + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta new file mode 100644 index 0000000000..f9fc52eb18 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5f3cdceb1529134a986e01cfa0d66a0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset b/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset new file mode 100644 index 0000000000..ab7fd0edd2 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Title3 + m_EditorClassIdentifier: + Id: fd331e360db5fbb448e66367e41d1893 + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta new file mode 100644 index 0000000000..e690a9b1e3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09d1c5fc70b293a4ab1411d9636b6f01 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab b/Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab index f3fabbe1a3..221153c79f 100644 --- a/Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab +++ b/Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab @@ -154,11 +154,11 @@ MonoBehaviour: _addedNetworkObject: {fileID: 4294524822034227355} _networkObjectCache: {fileID: 4294524822034227355} _powerConsumer: {fileID: 8272970134100573020} - _songs: - - {fileID: 8300000, guid: ec8b849764a7e9147b2a565f81a1ca42, type: 3} - - {fileID: 8300000, guid: fd331e360db5fbb448e66367e41d1893, type: 3} - - {fileID: 8300000, guid: 3f51862f0b88a5243a8cceb97147489d, type: 3} - RadioOn: 0 + _songReferences: + - {fileID: 11400000, guid: 25feb284497d72e419a785e18fd7e290, type: 2} + - {fileID: 11400000, guid: 09d1c5fc70b293a4ab1411d9636b6f01, type: 2} + - {fileID: 11400000, guid: f5f3cdceb1529134a986e01cfa0d66a0, type: 2} + AudioOn: 0 CurrentMusic: 0 InteractionIcon: {fileID: 21300000, guid: d1f34343e08a14e48a856e409c355f32, type: 3} InteractionIconOn: {fileID: 0} diff --git a/Assets/Content/WorldObjects/Items/Consumable/Food/Drinks/Soda/SodaCanGeneric.prefab b/Assets/Content/WorldObjects/Items/Consumable/Food/Drinks/Soda/SodaCanGeneric.prefab index d98066d8f8..08f96c17ee 100644 --- a/Assets/Content/WorldObjects/Items/Consumable/Food/Drinks/Soda/SodaCanGeneric.prefab +++ b/Assets/Content/WorldObjects/Items/Consumable/Food/Drinks/Soda/SodaCanGeneric.prefab @@ -319,9 +319,15 @@ MonoBehaviour: _lightImpactSounds: - {fileID: 8300000, guid: 1a34c805f84be3b4caac14d7de790607, type: 3} - {fileID: 8300000, guid: 8d93fdf9dcada204a952e29213f0293f, type: 3} + _lightImpactSoundReferences: + - {fileID: 11400000, guid: a018567162ec7ad40bdd2d7d8ae6074b, type: 2} + - {fileID: 11400000, guid: 5d6d1f8ffca30774e8791de6a68f2d97, type: 2} _hardImpactSounds: - {fileID: 8300000, guid: f00c6b5a098e84b4b87d80d23b4f295a, type: 3} - {fileID: 8300000, guid: b315c4abdef36244fb211c5f643d411a, type: 3} + _hardImpactSoundReferences: + - {fileID: 11400000, guid: 4cac36cceddb62f4c914372c095706e3, type: 2} + - {fileID: 11400000, guid: b30cc2cc7d13a7f459a5911da388787f, type: 2} --- !u!114 &2460252798676826451 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index f708c9f0c9..b54bdec91a 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -1,4 +1,7 @@ using SS3D.Attributes; +using System.Linq; +using UnityEditor.AddressableAssets; +using UnityEditor.AddressableAssets.Settings; using UnityEngine; namespace SS3D.Data.AssetDatabases @@ -20,5 +23,36 @@ public sealed class WorldObjectAssetReference : ScriptableObject #endif [Header("This file is auto-generated, do not modify it manually")] public string Database; - } + +#if UNITY_EDITOR + public void Init(Object asset) + { + string assetPath = UnityEditor.AssetDatabase.GetAssetPath(asset); + string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath); + + AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings; + AddressableAssetEntry entry = settings.FindAssetEntry(guid); + if (entry == null) + { + Debug.LogError($"Asset {asset.name} with GUID {guid} not found in Addressable Asset Settings."); + return; + } + + AssetDatabaseSettings databaseSettings = Coimbra.ScriptableSettings.GetOrFind(); + + if (!databaseSettings) + { + Debug.LogError("AssetDatabaseSettings not found."); + return; + } + + foreach (AssetDatabase database in databaseSettings.IncludedAssetDatabases.Where(database => database.AssetGroup == entry.parentGroup)) + { + Id = guid; + Database = database.DatabaseID; + break; + } + } + #endif + } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs index 3bcc442abe..82e5054a64 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs @@ -6,7 +6,9 @@ using SS3D.Core; using SS3D.Core.Behaviours; using SS3D.Data; +using SS3D.Data.AssetDatabases; using SS3D.Data.Generated; +using UnityEditor; using UnityEngine; namespace SS3D.Systems.Audio @@ -63,9 +65,9 @@ private void Start() /// Grabs a free audio source and parents it to a specific object before playing it. /// [Server] - public void PlayAudioSource(AudioType audioType, AudioClip audioClipId, NetworkObject parent) + public void PlayAudioSource(AudioType audioType, string audioClipId, NetworkObject parent) { - RpcPlayAudioSource(audioType, audioClipId.name, parent.transform.position, parent); + RpcPlayAudioSource(audioType, audioClipId, parent.transform.position, parent); } /// @@ -73,10 +75,10 @@ public void PlayAudioSource(AudioType audioType, AudioClip audioClipId, NetworkO /// Volume, pitch, and ranges are optional. /// [Server] - public void PlayAudioSource(AudioType audioType, AudioClip audioClipId, Vector3 position, NetworkObject parent, + public void PlayAudioSource(AudioType audioType, string audioClipId, Vector3 position, NetworkObject parent, bool isLooping = false, float volume = 0.7f, float pitch = 1f, float minRange = 1f, float maxRange = 500f) { - RpcPlayAudioSource(audioType, audioClipId.name, position, parent, isLooping, volume, pitch, minRange, maxRange); + RpcPlayAudioSource(audioType, audioClipId, position, parent, isLooping, volume, pitch, minRange, maxRange); } [Server] @@ -98,13 +100,13 @@ public void RPCSetTimeAudioSource(NetworkObject parent, float time) } [ObserversRpc] - public void RpcPlayAudioSource(AudioType type, string audioClip, Vector3 position, NetworkObject parent, + public void RpcPlayAudioSource(AudioType type, string audioClipID, Vector3 position, NetworkObject parent, bool isLooping = false, float volume = 0.7f, float pitch = 1f, float minRange = 1f, float maxRange = 500f) { AudioSource audioSource = FindAvailableAudioSource(type); audioSource.gameObject.transform.position = position; - audioSource.clip = Assets.Get(AssetDatabases.Sounds, audioClip); + audioSource.clip = Assets.Get(AssetDatabases.Sounds, audioClipID); audioSource.volume = volume; audioSource.pitch = pitch; audioSource.minDistance = minRange; @@ -240,6 +242,41 @@ public void PurgeUnusedAudioSources() } } } + +#if UNITY_EDITOR + [MenuItem("Assets/Create/Audio Clip Reference")] + private static void CreateAudioClipReference() + { + AudioClip[] selectedClips = UnityEditor.Selection.GetFiltered(SelectionMode.Assets); + + foreach (AudioClip selectedClip in selectedClips) + { + CreateAudioClipReference(selectedClip); + } + } + + private static void CreateAudioClipReference(AudioClip selectedClip) + { + if (!selectedClip) + { + Debug.LogError("No audio clip selected."); + + return; + } + + WorldObjectAssetReference asset = ScriptableObject.CreateInstance(); + asset.Init(selectedClip); + + string clipPath = UnityEditor.AssetDatabase.GetAssetPath(selectedClip); + string clipDirectory = System.IO.Path.GetDirectoryName(clipPath); + string assetPath = System.IO.Path.Combine(clipDirectory, $"{selectedClip.name}.asset"); + + UnityEditor.AssetDatabase.CreateAsset(asset, assetPath); + UnityEditor.AssetDatabase.SaveAssets(); + + Debug.Log($"Created Audio Clip Reference for {selectedClip.name} at {assetPath}", asset); + } + #endif } } diff --git a/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs b/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs index 21b4856667..ee1c1c7da1 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using UnityEngine; using SS3D.Core; +using SS3D.Data.AssetDatabases; using System.Electricity; using UnityEngine.Serialization; @@ -18,7 +19,7 @@ public class Boombox : InteractionTargetNetworkBehaviour, IToggleable private MachinePowerConsumer _powerConsumer; [SerializeField] - private List _songs; + private List _songReferences; [SyncVar] public bool AudioOn; @@ -54,7 +55,7 @@ public void Toggle() if (AudioOn) { - SubSystems.Get().PlayAudioSource(AudioType.Music, _songs[CurrentMusic], GameObject.transform.position, NetworkObject, + SubSystems.Get().PlayAudioSource(AudioType.Music, _songReferences[CurrentMusic].Id, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } else @@ -86,8 +87,8 @@ public void ChangeCurrentMusic() SubSystems.Get().StopAudioSource(NetworkObject); SubSystems.Get().SetTimeAudioSource(NetworkObject, 0f); - CurrentMusic = (CurrentMusic + 1) % (_songs.Count); - SubSystems.Get().PlayAudioSource(AudioType.Music, _songs[CurrentMusic], GameObject.transform.position, NetworkObject, + CurrentMusic = (CurrentMusic + 1) % _songReferences.Count; + SubSystems.Get().PlayAudioSource(AudioType.Music, _songReferences[CurrentMusic].Id, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } diff --git a/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs b/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs index be6a1a1d2a..117fd05d65 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs @@ -2,6 +2,7 @@ using FishNet.Object; using SS3D.Core; using FishNet; +using SS3D.Data.AssetDatabases; using UnityEngine.Serialization; namespace SS3D.Systems.Audio @@ -46,13 +47,21 @@ public class NoisyCollision : MonoBehaviour [Tooltip("How fast this object must hit another in order to make a hard impact sound.")] private float _hardImpactVelocity = 7.5f; + // [SerializeField] + // [Tooltip("List of possible sounds that will play when this object collides lightly.")] + // private AudioClip[] _lightImpactSounds; + [SerializeField] - [Tooltip("List of possible sounds that will play when this object collides lightly.")] - private AudioClip[] _lightImpactSounds; + [Tooltip("List of references of possible sounds that will play when this object collides lightly.")] + private WorldObjectAssetReference[] _lightImpactSoundReferences; + + // [SerializeField] + // [Tooltip("List of possible sounds that will play when this object collides heavily.")] + // private AudioClip[] _hardImpactSounds; [SerializeField] - [Tooltip("List of possible sounds that will play when this object collides heavily.")] - private AudioClip[] _hardImpactSounds; + [Tooltip("List of references of possible sounds that will play when this object collides heavily.")] + private WorldObjectAssetReference[] _hardImpactSoundReferences; //For some reason, this is needed to have an enable/disable feature. Peculiar. private void FixedUpdate() { } @@ -60,7 +69,7 @@ private void FixedUpdate() { } private void OnValidate() { // Throw a warning if the user configured it retardedly. - if ((!(_lightImpactVelocity > _hardImpactVelocity)) && (!_useHardImpactSounds || _hardImpactSounds != null) && (_lightImpactSounds != null)) + if ((!(_lightImpactVelocity > _hardImpactVelocity)) && (!_useHardImpactSounds || _hardImpactSoundReferences != null) && (_lightImpactSoundReferences != null)) { return; } @@ -79,11 +88,11 @@ private void OnCollisionEnter(Collision other) //Only execute this code if we're supposed to make collision noises. if (_useHardImpactSounds && other.relativeVelocity.magnitude > _hardImpactVelocity) { - PlayCollisionSound(_hardImpactSounds); + PlayCollisionSound(_hardImpactSoundReferences); } else if (other.relativeVelocity.magnitude > _lightImpactVelocity) { - PlayCollisionSound(_lightImpactSounds); + PlayCollisionSound(_lightImpactSoundReferences); } } @@ -92,19 +101,19 @@ private void OnCollisionEnter(Collision other) /// /// [Server] - private void PlayCollisionSound(AudioClip[] soundPool) + private void PlayCollisionSound(WorldObjectAssetReference[] soundPool) { float pitch = Random.Range(_basePitch - _pitchModulationLow, _basePitch + _pitchModulationHigh); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, PickSound(soundPool), gameObject.transform.position, null, + SubSystems.Get().PlayAudioSource(AudioType.Sfx, PickSound(soundPool).Id, gameObject.transform.position, null, false, _collisionVolume, pitch); } - private AudioClip PickSound(AudioClip[] availableSounds) + private WorldObjectAssetReference PickSound(WorldObjectAssetReference[] availableSounds) { // Pick a clip from the supplied array and return it - AudioClip currentClip = availableSounds[Random.Range(0, availableSounds.Length)]; + WorldObjectAssetReference currentClipReference = availableSounds[Random.Range(0, availableSounds.Length)]; - return currentClip; + return currentClipReference; } } } diff --git a/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs b/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs index 1b7e3ad9d3..40a30e62b1 100644 --- a/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs +++ b/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs @@ -62,8 +62,7 @@ private void HandleSound(bool isEnabled) } else { - AudioClip fuelPowerGeneratorClip = Assets.Get(AssetDatabases.Sounds, Sounds.FuelPowerGenerator); - SubSystems.Get().PlayAudioSource(AudioType.Music, fuelPowerGeneratorClip, Position, NetworkObject, true, 0.7f, 1, 1, 10); + SubSystems.Get().PlayAudioSource(AudioType.Music, Sounds.FuelPowerGenerator, Position, NetworkObject, true, 0.7f, 1, 1, 10); } } diff --git a/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs b/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs index 60f8695684..456d731cf0 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs @@ -33,15 +33,13 @@ public override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo if (stateInfo.IsName(Opening)) { ChangeColors(_openingColor, animator); - AudioClip airlockOpenClip = Assets.Get(AssetDatabases.Sounds, Sounds.AirlockOpen); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, airlockOpenClip, animator.GetComponent()); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.AirlockOpen, animator.GetComponent()); } if (stateInfo.IsName(Closing)) { ChangeColors(_closingColor, animator); - AudioClip airlockCloseClip = Assets.Get(AssetDatabases.Sounds, Sounds.AirlockClose); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, airlockCloseClip, animator.GetComponent()); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.AirlockClose, animator.GetComponent()); } } diff --git a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs index efed611d73..1d8eec98ed 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs @@ -76,8 +76,7 @@ public void DispenseProduct(int productIndex) if (productToDispenseStock.Stock <= 0) { - AudioClip bikeHornClip = Assets.Get(AssetDatabases.Sounds, Sounds.BikeHorn); - audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, bikeHornClip, Position, NetworkObject, false, 0.7f, 1, 1, 3); + audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, Sounds.BikeHorn, Position, NetworkObject, false, 0.7f, 1, 1, 3); return; } @@ -85,8 +84,7 @@ public void DispenseProduct(int productIndex) _powerConsumer.UseMachineOnce(); productToDispenseStock.Stock--; - AudioClip can1Clip = Assets.Get(AssetDatabases.Sounds, Sounds.Can1); - audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, can1Clip, Position, NetworkObject, false, 0.7f, 1, 1, 3); + audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, Sounds.Can1, Position, NetworkObject, false, 0.7f, 1, 1, 3); ItemSubSystem itemSystem = SubSystems.Get(); Quaternion quaternion = Quaternion.Euler(new Vector3(Random.Range(0, 360), Random.Range(0, 360), Random.Range(0, 360))); diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs index 99f3393668..e6dd6d5626 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs @@ -26,8 +26,7 @@ public class BikeHorn : Item public void Honk() { _animator.SetTrigger(HonkAnimation); - AudioClip bikeHornClip = Assets.Get(AssetDatabases.Sounds, Sounds.BikeHorn); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, bikeHornClip, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.BikeHorn, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } public bool IsHonking() From 75223f230dc18769aaf20e2c113e40b31a258066 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Mon, 2 Feb 2026 16:39:17 -0500 Subject: [PATCH 12/54] Refactor asset retrieval in CraftingRecipe, CraftingSubSystem, MultiStepCraftable, and Item to simplify usage of Assets.Get method --- Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs | 2 +- .../Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs | 10 +++++----- .../SS3D/Systems/Crafting/MultiStepCraftable.cs | 2 +- Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs index d870f6078c..63a973803e 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs @@ -26,7 +26,7 @@ public class CraftingRecipe : ScriptableObject /// /// First step of the recipe, which should have the same name as the target of the recipe. /// - public string RootStepName => Target ? Assets.Get(Target.Database, Target.Id)?.name : null; + public string RootStepName => Target ? Assets.Get(Target)?.name : null; public bool HasInitial => Steps.Any(x => x.IsInitialState); diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs index ffe4dd3032..c864c66ef5 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs @@ -100,7 +100,7 @@ private bool TryGetRecipeLinks(CraftingInteractionType interactionType, GameObje if (!_recipeOrganiser.TryGetValue(targetAssetReference.Asset.Id, out List recipes)) { - Log.Information(this, $"no recipes with target's name {targetAssetReference.Asset.Id}"); + Log.Information(this, $"no recipes with target's name {targetAssetReference.Asset.name}"); return false; } @@ -156,7 +156,7 @@ public void Craft(CraftingInteraction interaction, InteractionEvent interactionE { for (int i = 0; i < secondaryResult.Amount; i++) { - GameObject secondaryResultPrefab = Assets.Get(secondaryResult.Asset.Database, secondaryResult.Asset.Id); + GameObject secondaryResultPrefab = Assets.Get(secondaryResult.Asset); DefaultCraft(interaction, interactionEvent, secondaryResultPrefab, link.Target); } } @@ -190,7 +190,7 @@ private void SpawnOrModifyMainResult(WorldObjectAssetReference result, CraftingI { GameObject resultInstance; - GameObject resultPrefab = Assets.Get(result.Database, result.Id); + GameObject resultPrefab = Assets.Get(result); if (!resultPrefab) { @@ -228,7 +228,7 @@ private string CurrentStepName(GameObject target) return ""; } - GameObject targetPrefab = Assets.Get(targetAssetReference.Asset.Database, targetAssetReference.Asset.Id); + GameObject targetPrefab = Assets.Get(targetAssetReference.Asset); if (targetPrefab == null) { @@ -553,7 +553,7 @@ private bool ResultIsValid(InteractionEvent interactionEvent, RecipeStep recipeS { if (!recipeStep.TryGetResult(out WorldObjectAssetReference recipeResult)) return true; - GameObject recipeResultPrefab = Assets.Get(recipeResult.Database, recipeResult.Id); + GameObject recipeResultPrefab = Assets.Get(recipeResult); if (recipeResultPrefab && recipeResultPrefab.TryGetComponent(out PlacedTileObject result)) { diff --git a/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs b/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs index 8a70bb5116..d883f00872 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs @@ -32,7 +32,7 @@ protected override void OnAwake() } else { - GameObject targetPrefab = Assets.Get(targetAssetReference.Asset.Database, targetAssetReference.Asset.Id); + GameObject targetPrefab = Assets.Get(targetAssetReference.Asset); _currentStepName = targetPrefab?.name; } } diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs index bbe857c979..15362c91e4 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs @@ -120,7 +120,7 @@ public WorldObjectAssetReference Asset } } - public Item Prefab => Asset ? Assets.Get(Asset.Database, Asset.Id) : null; + public Item Prefab => Asset ? Assets.Get(Asset) : null; /// /// Initialise this item fields. Can only be called once. From 49a8e4e4a10a20ce5782f750f4d53de651542358 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:19:35 -0500 Subject: [PATCH 13/54] Refactor asset management in AssetDatabase and WorldObjectAssetReference to streamline addressable asset handling and improve code clarity --- .../SS3D/Data/AssetDatabases/AssetDatabase.cs | 61 ++++++++++++++++--- .../WorldObjectAssetReference.cs | 45 +++++++++++++- Assets/Scripts/SS3D/Data/Assets.cs | 27 +++++++- .../SS3D/Systems/Audio/AudioSubSystem.cs | 26 +------- 4 files changed, 120 insertions(+), 39 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs index b67e3be321..eb68259ef2 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs @@ -1,16 +1,14 @@ using Coimbra; using JetBrains.Annotations; using Serilog; -using System.Collections.Generic; -using Object = UnityEngine.Object; -using SS3D.CodeGeneration; using SS3D.CodeGeneration.Creators; +using System.Collections.Generic; using System.Linq; -using UnityEditor; using UnityEngine; -using UnityEngine.Serialization; - +using Object = UnityEngine.Object; #if UNITY_EDITOR +using UnityEditor; +using UnityEditor.AddressableAssets; using UnityEditor.AddressableAssets.Settings; #endif @@ -45,11 +43,11 @@ public sealed class AssetDatabase : ScriptableObject /// The asset group that constitutes this AssetDatabase, the system gets every asset from it and adds to an asset list. /// public AddressableAssetGroup AssetGroup; - +#endif + /// /// All loaded assets that will be included in the built game. /// -#endif public SerializableDictionary Assets; #if UNITY_EDITOR @@ -108,10 +106,10 @@ public bool TryGet([NotNull] string index, [CanBeNull] out T asset) /// /// /// - public void Add(Object asset) + public void Add([NotNull] TAsset asset) where TAsset : Object { - Assets.Add(asset.name, asset as TAsset); + Assets.Add(asset.name, asset); } #if UNITY_EDITOR @@ -148,6 +146,49 @@ public void GenerateDatabaseCode() DatabaseScriptCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values.ToList(), DatabaseAssetNamespaceName); } + + public bool AddToAddressables([NotNull] Object asset) + { + string path = UnityEditor.AssetDatabase.GetAssetPath(asset); + + if (string.IsNullOrEmpty(path)) + { + Log.Error($"Asset {asset.name} does not have a valid path, cannot add to addressables."); + + return false; + } + + string guid = UnityEditor.AssetDatabase.AssetPathToGUID(path); + + if (!AssetGroup) + { + Log.Error($"Addressable Asset Group {name} not found, cannot add asset {asset.name} to addressables."); + + return false; + } + + AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings; + AddressableAssetEntry entry = settings.FindAssetEntry(guid); + + if (entry != null) + { + Log.Warning($"Asset {asset.name} is already in Addressable Group {entry.parentGroup.name}."); + + return false; + } + + settings.CreateOrMoveEntry(guid, AssetGroup); + + Add(asset); + + EditorUtility.SetDirty(asset); + EditorUtility.SetDirty(this); + + UnityEditor.AssetDatabase.SaveAssetIfDirty(asset); + UnityEditor.AssetDatabase.SaveAssetIfDirty(this); + + return true; + } #endif } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index b54bdec91a..5169a754ee 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -1,7 +1,10 @@ -using SS3D.Attributes; +using JetBrains.Annotations; +using SS3D.Attributes; using System.Linq; +#if UNITY_EDITOR using UnityEditor.AddressableAssets; using UnityEditor.AddressableAssets.Settings; + #endif using UnityEngine; namespace SS3D.Data.AssetDatabases @@ -12,6 +15,13 @@ namespace SS3D.Data.AssetDatabases /// public sealed class WorldObjectAssetReference : ScriptableObject { +#if UNITY_EDITOR + /// + /// The path in the project where to put the WorldObjectAssetReference assets. + /// + public static readonly string WorldObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; +#endif + #if UNITY_EDITOR [ReadOnly] #endif @@ -25,8 +35,36 @@ public sealed class WorldObjectAssetReference : ScriptableObject public string Database; #if UNITY_EDITOR - public void Init(Object asset) + [CanBeNull] + public static WorldObjectAssetReference Create(Object asset) { + if (!asset) + { + Debug.LogError("No asset found."); + + return null; + } + + WorldObjectAssetReference assetReference = CreateInstance(); + assetReference.Init(asset); + + string assetPath = System.IO.Path.Combine(WorldObjectAssetPath, $"{asset.name}.asset"); + + UnityEditor.AssetDatabase.CreateAsset(assetReference, assetPath); + UnityEditor.AssetDatabase.SaveAssetIfDirty(assetReference); + + return assetReference; + } + + private void Init(Object asset) + { + if (!asset) + { + Debug.LogError("No asset found."); + + return; + } + string assetPath = UnityEditor.AssetDatabase.GetAssetPath(asset); string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath); @@ -53,6 +91,7 @@ public void Init(Object asset) break; } } - #endif + + #endif } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/Assets.cs b/Assets/Scripts/SS3D/Data/Assets.cs index a54c2e1b80..f3e11a4932 100644 --- a/Assets/Scripts/SS3D/Data/Assets.cs +++ b/Assets/Scripts/SS3D/Data/Assets.cs @@ -1,10 +1,17 @@ -using System.Collections.Generic; -using Coimbra; +using Coimbra; using JetBrains.Annotations; using SS3D.Data.AssetDatabases; using SS3D.Logging; using System; +using System.Collections.Generic; +using AssetDatabase = SS3D.Data.AssetDatabases.AssetDatabase; using Object = UnityEngine.Object; +#if UNITY_EDITOR +using System.IO; +using UnityEditor; +using UnityEditor.AddressableAssets; +using UnityEditor.AddressableAssets.Settings; +#endif namespace SS3D.Data { @@ -95,5 +102,21 @@ public static AssetDatabase GetDatabase([NotNull] string databaseId) return database; } + +#if UNITY_EDITOR + public static bool AddToAddressables(string databaseID, Object asset) + { + AssetDatabase database = GetDatabase(databaseID); + + if (database) + { + return database.AddToAddressables(asset); + } + + Log.Error(typeof(Assets), $"Database of type {databaseID} not found cannot add to addressables"); + return false; + + } +#endif } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs index 82e5054a64..a1b6d755ee 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs @@ -251,32 +251,10 @@ private static void CreateAudioClipReference() foreach (AudioClip selectedClip in selectedClips) { - CreateAudioClipReference(selectedClip); + WorldObjectAssetReference.Create(selectedClip); } } - - private static void CreateAudioClipReference(AudioClip selectedClip) - { - if (!selectedClip) - { - Debug.LogError("No audio clip selected."); - - return; - } - - WorldObjectAssetReference asset = ScriptableObject.CreateInstance(); - asset.Init(selectedClip); - - string clipPath = UnityEditor.AssetDatabase.GetAssetPath(selectedClip); - string clipDirectory = System.IO.Path.GetDirectoryName(clipPath); - string assetPath = System.IO.Path.Combine(clipDirectory, $"{selectedClip.name}.asset"); - - UnityEditor.AssetDatabase.CreateAsset(asset, assetPath); - UnityEditor.AssetDatabase.SaveAssets(); - - Debug.Log($"Created Audio Clip Reference for {selectedClip.name} at {assetPath}", asset); - } - #endif +#endif } } From df284baf78e65cee0dc48bda3eef9a185bac6360 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:36:14 -0500 Subject: [PATCH 14/54] Refactor asset handling in PlacedItemObject, PlacedTileObject, and ConstructionHologramManager to utilize WorldObjectAssetReference for improved asset retrieval --- .../Tile/PlacedObjects/PlacedItemObject.cs | 4 +++- .../Tile/PlacedObjects/PlacedTileObject.cs | 4 +++- .../SS3D/Systems/Tile/SO/GenericObjectSo.cs | 11 +++++++---- .../ConstructionHologramManager.cs | 17 ++++++++++++----- .../SS3D/Systems/Tile/TileResourceLoader.cs | 3 ++- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedItemObject.cs b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedItemObject.cs index 590e84ae3e..a8fef437be 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedItemObject.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedItemObject.cs @@ -1,6 +1,7 @@ using FishNet; using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Logging; using System; using System.Collections; @@ -34,7 +35,8 @@ public static PlacedItemObject Create(Vector3 worldPosition, Quaternion rotation } else { - placedGameObject = Instantiate(itemSo.prefab); + GameObject itemPrefab = Assets.Get(itemSo.PrefabAsset); + placedGameObject = Instantiate(itemPrefab); } placedGameObject.transform.SetPositionAndRotation(worldPosition, rotation); diff --git a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs index 5d167dd843..21776e90df 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs @@ -2,6 +2,7 @@ using FishNet.Object; using SS3D.Attributes; using SS3D.Core; +using SS3D.Data; using SS3D.Data.AssetDatabases; using SS3D.Logging; using SS3D.Systems.Tile.Connections; @@ -29,7 +30,8 @@ public class PlacedTileObject: NetworkBehaviour, IWorldObjectAsset /// public static PlacedTileObject Create(Vector3 worldPosition, Vector2Int origin, Direction dir, TileObjectSo tileObjectSo) { - GameObject placedGameObject = Instantiate(tileObjectSo.prefab); + GameObject tileObjectPrefab = Assets.Get(tileObjectSo.PrefabAsset); + GameObject placedGameObject = Instantiate(tileObjectPrefab); placedGameObject.transform.SetPositionAndRotation(worldPosition, Quaternion.Euler(0, TileHelper.GetRotationAngle(dir), 0)); PlacedTileObject placedObject = placedGameObject.GetComponent(); diff --git a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs index 2353430225..a215b2be05 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; -using System.Collections; -using System.Collections.Generic; +using SS3D.Data.AssetDatabases; using UnityEngine; namespace SS3D.Systems.Tile @@ -11,9 +10,13 @@ namespace SS3D.Systems.Tile public class GenericObjectSo : ScriptableObject { [NotNull] - public string NameString => prefab.name; + public string NameString => PrefabAsset.name; - public GameObject prefab; + public WorldObjectAssetReference PrefabAsset; public Sprite icon; + + [SerializeField] + [HideInInspector] + private string _nameString; } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs index 814bd0366b..260c9c60cc 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs @@ -4,6 +4,8 @@ using FishNet.Object; using SS3D.Core; using SS3D.Core.Behaviours; +using SS3D.Data; +using SS3D.Data.AssetDatabases; using SS3D.Logging; using SS3D.Systems.Inputs; using SS3D.Utils; @@ -62,7 +64,7 @@ public void SetSelectedObject(GenericObjectSo genericObjectSo) _selectedObject = genericObjectSo; DestroyHolograms(); - CreateHologram(genericObjectSo.prefab, TileHelper.GetPointedPosition(!_isPlacingItem)); + CreateHologram(genericObjectSo.PrefabAsset, TileHelper.GetPointedPosition(!_isPlacingItem)); } protected override void OnAwake() @@ -142,7 +144,7 @@ private void HandleUpdate(ref EventContext context, in UpdateEvent updateEvent) { for (int i = 0; i < -difference; i++) { - CreateHologram(_selectedObject.prefab, new()); + CreateHologram(_selectedObject.PrefabAsset, new()); } } @@ -172,8 +174,9 @@ public void SetNextRotation() /// /// Instantiate in the correct position and rotation a single hologram. /// - public ConstructionHologram CreateHologram(GameObject prefab, Vector3 position) + public ConstructionHologram CreateHologram(WorldObjectAssetReference prefabAsset, Vector3 position) { + GameObject prefab = Assets.Get(prefabAsset); GameObject tileObject = Instantiate(prefab); ConstructionHologram hologram = new(tileObject, position, _lastRegisteredDirection); tileObject.transform.rotation = Quaternion.Euler(0, TileHelper.GetRotationAngle(hologram.Direction), 0); @@ -239,8 +242,12 @@ private void HandlePlacePerformed(InputAction.CallbackContext context) DestroyHolograms(); - if (_selectedObject == null) return; - CreateHologram(_selectedObject.prefab, TileHelper.GetPointedPosition(!_isPlacingItem)); + if (_selectedObject == null) + { + return; + } + + CreateHologram(_selectedObject.PrefabAsset, TileHelper.GetPointedPosition(!_isPlacingItem)); } /// diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs b/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs index a366300099..c6e25bb6f3 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs @@ -41,7 +41,8 @@ private IEnumerator LoadAssetsWithIcon(GenericObjectSo[] assets) foreach (GenericObjectSo asset in assets) { - Transform prefabTransform = asset.prefab.transform; + GameObject prefab = Data.Assets.Get(asset.PrefabAsset); + Transform prefabTransform = prefab.transform; Shader shader = Shader.Find("Unlit/ObjectIcon"); Texture2D texture = RuntimePreviewGenerator.GenerateModelPreviewWithShader(prefabTransform, shader, null, 128, 128, true); From 0c9341636a078d205fabb7bef9bea70eb7748e42 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:37:22 -0500 Subject: [PATCH 15/54] Add new world object asset references files for various objects TileObjectsSO prefabs to enhance asset management --- .../Addressables/AssetGroups/Items.asset | 328 ++++++++++++++++++ Assets/Content/Data/Databases/Items.asset | 164 +++++++++ .../Furniture/Flora/PottedPlants/Plant0.asset | 4 +- .../Furniture/Flora/PottedPlants/Plant7.asset | 4 +- .../Furniture/Generic/JukeboxBlueGreen.asset | 4 +- .../Furniture/Generic/NukeCart.asset | 4 +- .../Seats/Chairs/Office/OfficeChair.asset | 4 +- .../Seats/Chairs/Office/OfficeChairBlue.asset | 4 +- .../Seats/Chairs/Office/OfficeChairGrey.asset | 4 +- .../Seats/Chairs/Plastic/PlasticChair.asset | 4 +- .../Chairs/Plastic/PlasticChairBlue.asset | 4 +- .../Chairs/Plastic/PlasticChairGrey.asset | 4 +- .../Furniture/Generic/Seats/DinnerBooth.asset | 4 +- .../Resources/Furniture/Generic/Sink.asset | 3 + .../Surfaces/Tables/TableFrameSteel.asset | 4 +- .../Surfaces/Tables/TableFrameWood.asset | 4 +- .../Generic/Surfaces/Tables/TableGlass.asset | 4 +- .../Generic/Surfaces/Tables/TablePoker.asset | 4 +- .../Generic/Surfaces/Tables/TableSteel.asset | 4 +- .../Generic/Surfaces/Tables/TableWood.asset | 4 +- .../Furniture/Generic/WaterCooler.asset | 4 +- .../Machines/Atmospherics/Scrubber.asset | 4 +- .../Machines/Atmospherics/Vent.asset | 4 +- .../Engineering/PacManGenerator.asset | 4 +- .../Engineering/PowerCellCharger.asset | 3 + .../Furniture/Machines/Engineering/SMES.asset | 4 +- .../Machines/Engineering/SolarPanel.asset | 3 + .../Engineering/SolarTrackingBeacon.asset | 4 +- .../Machines/Generic/SlotMachine.asset | 3 + .../Machines/Generic/Tanks/FuelTank.asset | 3 + .../Machines/Generic/Tanks/WaterTank.asset | 3 + .../Furniture/Machines/Kitchen/Blender.asset | 4 +- .../Furniture/Machines/Kitchen/Gibber.asset | 3 + .../Machines/Kitchen/Microwave.asset | 4 +- .../Kitchen/TableBoozeDispenser.asset | 4 +- .../Furniture/Machines/MachineFrame.asset | 3 + .../Machines/Medical/ChemicalDispenser.asset | 3 + .../Furniture/Machines/Medical/Cryotube.asset | 3 + .../Machines/Medical/SleeperBed.asset | 3 + .../Machines/Supply/DisposalBin.asset | 4 +- .../Machines/Supply/DisposalOutlet.asset | 4 +- .../Machines/Vendors/VendorHotDrinks.asset | 4 +- .../Vendors/VendorRobustSoftdrinks.asset | 4 +- .../Machines/Vendors/VendorSecTech.asset | 4 +- .../Machines/Vendors/VendorYouTool.asset | 4 +- .../Furniture/Storage/Lockers/Locker.asset | 4 +- .../Storage/Lockers/SecureLocker.asset | 4 +- .../Storage/Lockers/SecurityLocker.asset | 4 +- .../Resources/Items/Clothing/Backpack.asset | 3 +- .../Resources/Items/Clothing/GasMask.asset | 3 +- .../Items/Clothing/GloveInsulated.asset | 2 + .../Resources/Items/Clothing/Headset.asset | 2 + .../Items/Clothing/HeadsetSecurity.asset | 2 + .../Items/Clothing/JumpsuitBotany.asset | 2 + .../Items/Clothing/JumpsuitEngineer.asset | 2 + .../Items/Clothing/JumpsuitGrey.asset | 2 + .../Items/Clothing/JumpsuitSecurity.asset | 2 + .../Resources/Items/Clothing/ShoeHiTop.asset | 2 + .../Items/Clothing/ShoeJackboots.asset | 2 + .../Resources/Items/Clothing/Sunglasses.asset | 3 +- .../Resources/Items/Clothing/ToolBelt.asset | 3 +- .../Resources/Items/Clothing/TruckerCap.asset | 3 +- .../Consumables/Chemical/BrutePatch.asset | 2 + .../Consumables/Chemical/BurnPatch.asset | 2 + .../Consumables/Chemical/MedicalPatch.asset | 2 + .../Food/Drinks/Soda/SodaCanBeepsSoda.asset | 3 +- .../Food/Drinks/Soda/SodaCanBeepyLime.asset | 3 +- .../Food/Drinks/Soda/SodaCanCannedAir.asset | 3 +- .../Drinks/Soda/SodaCanCannedLaughter.asset | 3 +- .../Food/Drinks/Soda/SodaCanCola.asset | 3 +- .../Drinks/Soda/SodaCanDukePurpleTea.asset | 3 +- .../Food/Drinks/Soda/SodaCanTonic.asset | 3 +- .../Food/General/Snacks/DonkPocket.asset | 2 + .../Resources/Items/Cosmetic/BikeHorn.asset | 3 +- .../Data/TileMap/Resources/Items/Doodad.asset | 3 +- .../Items/Functional/Generic/Boombox.asset | 2 + .../Items/Functional/Generic/FloorTile.asset | 2 + .../Generic/Identification/IDCard.asset | 3 +- .../Generic/Identification/PDA.asset | 3 +- .../Identification/SecurityIDCard.asset | 3 +- .../Generic/Identification/SecurityPDA.asset | 3 +- .../Items/Functional/Generic/Poster.asset | 3 +- .../Functional/Generic/Tanks/OxygenTank.asset | 2 + .../Functional/Generic/Tanks/PlasmaTank.asset | 2 + .../Materials/ElectricalCable.asset | 2 + .../Functional/Materials/ElectricalWire.asset | 2 + .../Materials/GlassReinforcedSheet.asset | 2 + .../Functional/Materials/GlassShard.asset | 2 + .../Functional/Materials/GlassSheet.asset | 2 + .../Materials/SteelReinforcedSheet.asset | 2 + .../Items/Functional/Materials/SteelRod.asset | 2 + .../Functional/Materials/SteelSheet.asset | 2 + .../Items/Functional/Materials/WoodLog.asset | 2 + .../Functional/Materials/WoodPlank.asset | 2 + .../Parts/MachineParts/MatterBin.asset | 2 + .../Parts/MachineParts/MicroLaser.asset | 2 + .../Parts/PowerCells/PowerCell.asset | 3 +- .../Parts/PowerCells/PowerCellAdmin.asset | 3 +- .../Functional/Storage/Objects/Medkit.asset | 2 + .../Storage/Objects/ToolboxBlue.asset | 3 +- .../Functional/Storage/Substances/Mug.asset | 3 +- .../Functional/Tools/Botany/Hatchet.asset | 2 + .../Command/NuclearAuthenticationDisk.asset | 3 +- .../Tools/Engineering/Crowbar.asset | 3 +- .../Tools/Engineering/Multitool.asset | 3 +- .../Tools/Engineering/ScrewdriverBlue.asset | 3 +- .../Functional/Tools/Engineering/Welder.asset | 2 + .../Tools/Engineering/Wirecutters.asset | 3 +- .../Functional/Tools/Engineering/Wrench.asset | 3 +- .../Tools/Generic/FlashlightBlue.asset | 3 +- .../Tools/Kitchen/KitchenKnife.asset | 3 +- .../Tools/Medical/HealthScanner.asset | 2 + .../Structures/Doors/AirlockCivilian.asset | 4 +- .../Structures/Doors/AirlockSecurity.asset | 4 +- .../Resources/Structures/Floors/Catwalk.asset | 4 +- .../Resources/Structures/Floors/Lattice.asset | 4 +- .../Resources/Structures/Floors/Plenum.asset | 4 +- .../Floors/TileOverlays/CornerBlue.asset | 4 +- .../Floors/TileOverlays/CornerBrown.asset | 4 +- .../Floors/TileOverlays/CornerGreen.asset | 4 +- .../Floors/TileOverlays/CornerOrange.asset | 4 +- .../Floors/TileOverlays/CornerPurple.asset | 4 +- .../Floors/TileOverlays/CornerRed.asset | 4 +- .../Structures/Floors/Tiles/TIleGrey.asset | 4 +- .../Structures/Floors/Tiles/TileBar.asset | 4 +- .../Structures/Floors/Tiles/TileCarpet.asset | 6 +- .../Structures/Floors/Tiles/TileDirt.asset | 4 +- .../Structures/Floors/Tiles/TileGrass.asset | 4 +- .../Floors/Tiles/TileGreyDark.asset | 4 +- .../Structures/Floors/Tiles/TileKitchen.asset | 4 +- .../Structures/Floors/Tiles/TilePlating.asset | 4 +- .../Floors/Tiles/TileReinforced.asset | 4 +- .../Structures/Floors/Tiles/TileWhite.asset | 4 +- .../Structures/Floors/Tiles/TileWood.asset | 4 +- .../Atmospherics/AtmosphericsPipesL1.asset | 4 +- .../Atmospherics/AtmosphericsPipesL2.asset | 4 +- .../Atmospherics/AtmosphericsPipesL3.asset | 4 +- .../Atmospherics/AtmosphericsPipesL4.asset | 4 +- .../Pipes/Disposals/DisposalPipes.asset | 4 +- .../Resources/Structures/WallMounts/APC.asset | 2 + .../Structures/WallMounts/AirAlarm.asset | 2 + .../Structures/WallMounts/FireAlarm.asset | 2 + .../Structures/WallMounts/LightSwitch.asset | 4 +- .../WallMounts/Lights/LightBulbFixture.asset | 4 +- .../WallMounts/Lights/LightTubeFixture.asset | 4 +- .../Structures/WallMounts/Mirror.asset | 2 + .../WallMounts/Posters/PosterHorizontal.asset | 2 + .../WallMounts/Posters/PosterVertical.asset | 2 + .../Structures/Walls/SteelGirder.asset | 4 +- .../Walls/SteelGirderUnbolted.asset | 2 + .../Structures/Walls/SteelWall.asset | 4 +- .../Walls/SteelWallReinforced.asset | 4 +- .../Structures/Walls/SteelWindow.asset | 4 +- .../Walls/SteelWindowReinforced.asset | 4 +- .../Resources/Structures/Wires/Cables.asset | 4 +- .../Data/WorldObjectAssetReferences/APC.asset | 16 + .../WorldObjectAssetReferences/APC.asset.meta | 8 + .../WorldObjectAssetReferences/AirAlarm.asset | 16 + .../AirAlarm.asset.meta | 8 + .../AtmosPipesL1.asset | 16 + .../AtmosPipesL1.asset.meta | 8 + .../AtmosPipesL2.asset | 16 + .../AtmosPipesL2.asset.meta | 8 + .../AtmosPipesL3.asset | 16 + .../AtmosPipesL3.asset.meta | 8 + .../AtmosPipesL4.asset | 16 + .../AtmosPipesL4.asset.meta | 8 + .../WorldObjectAssetReferences/Blender.asset | 16 + .../Blender.asset.meta | 8 + .../WorldObjectAssetReferences/Cables.asset | 16 + .../Cables.asset.meta | 8 + .../WorldObjectAssetReferences/Catwalk.asset | 16 + .../Catwalk.asset.meta | 8 + .../ChemicalDispenser.asset | 16 + .../ChemicalDispenser.asset.meta | 8 + .../CivillianAirlock.asset | 16 + .../CivillianAirlock.asset.meta | 8 + .../WorldObjectAssetReferences/Cryotube.asset | 16 + .../Cryotube.asset.meta | 8 + .../DinnerBooth.asset | 16 + .../DinnerBooth.asset.meta | 8 + .../DisposalBin.asset | 16 + .../DisposalBin.asset.meta | 8 + .../DisposalOutlet.asset | 16 + .../DisposalOutlet.asset.meta | 8 + .../DisposalPipes.asset | 16 + .../DisposalPipes.asset.meta | 8 + .../FancyCarpetRed.asset | 16 + .../FancyCarpetRed.asset.meta | 8 + .../FireAlarm.asset | 16 + .../FireAlarm.asset.meta | 8 + .../WorldObjectAssetReferences/FuelTank.asset | 16 + .../FuelTank.asset.meta | 8 + .../WorldObjectAssetReferences/Gibber.asset | 16 + .../Gibber.asset.meta | 8 + .../JukeboxBlueGreen.asset | 16 + .../JukeboxBlueGreen.asset.meta | 8 + .../WorldObjectAssetReferences/Lattice.asset | 16 + .../Lattice.asset.meta | 8 + .../LightBulbFixture.asset | 16 + .../LightBulbFixture.asset.meta | 8 + .../LightSwitch.asset | 16 + .../LightSwitch.asset.meta | 8 + .../LightTubeFixture.asset | 16 + .../LightTubeFixture.asset.meta | 8 + .../WorldObjectAssetReferences/Locker.asset | 16 + .../Locker.asset.meta | 8 + .../LockerSecure.asset | 16 + .../LockerSecure.asset.meta | 8 + .../MachineFrame.asset | 16 + .../MachineFrame.asset.meta | 8 + .../Microwave.asset | 16 + .../Microwave.asset.meta | 8 + .../WorldObjectAssetReferences/Mirror.asset | 16 + .../Mirror.asset.meta | 8 + .../WorldObjectAssetReferences/NukeCart.asset | 16 + .../NukeCart.asset.meta | 8 + .../OfficeChair.asset | 16 + .../OfficeChair.asset.meta | 8 + .../OfficeChairBlue.asset | 16 + .../OfficeChairBlue.asset.meta | 8 + .../OfficeChairGrey.asset | 16 + .../OfficeChairGrey.asset.meta | 8 + .../PacManGenerator.asset | 16 + .../PacManGenerator.asset.meta | 8 + .../WorldObjectAssetReferences/Plant0.asset | 16 + .../Plant0.asset.meta | 8 + .../WorldObjectAssetReferences/Plant7.asset | 16 + .../Plant7.asset.meta | 8 + .../PlasticChair.asset | 16 + .../PlasticChair.asset.meta | 8 + .../PlasticChairBlue.asset | 16 + .../PlasticChairBlue.asset.meta | 8 + .../PlasticChairGrey.asset | 16 + .../PlasticChairGrey.asset.meta | 8 + .../PosterHorizontal.asset | 16 + .../PosterHorizontal.asset.meta | 8 + .../PosterVertical.asset | 16 + .../PosterVertical.asset.meta | 8 + .../PowerCellCharger.asset | 16 + .../PowerCellCharger.asset.meta | 8 + .../WorldObjectAssetReferences/SMES.asset | 16 + .../SMES.asset.meta | 8 + .../WorldObjectAssetReferences/Scrubber.asset | 16 + .../Scrubber.asset.meta | 8 + .../SecurityAirlock.asset | 16 + .../SecurityAirlock.asset.meta | 8 + .../SecurityLocker.asset | 16 + .../SecurityLocker.asset.meta | 8 + .../WorldObjectAssetReferences/Sink.asset | 16 + .../Sink.asset.meta | 8 + .../SleeperBed.asset | 16 + .../SleeperBed.asset.meta | 8 + .../SlotMachine.asset | 16 + .../SlotMachine.asset.meta | 8 + .../SolarPanel.asset | 16 + .../SolarPanel.asset.meta | 8 + .../SolarTrackingBeacon.asset | 16 + .../SolarTrackingBeacon.asset.meta | 8 + .../TableBoozeDispenser.asset | 16 + .../TableBoozeDispenser.asset.meta | 8 + .../TableFrameSteel.asset | 16 + .../TableFrameSteel.asset.meta | 8 + .../TableFrameWood.asset | 16 + .../TableFrameWood.asset.meta | 8 + .../TableGlass.asset | 16 + .../TableGlass.asset.meta | 8 + .../TablePoker.asset | 16 + .../TablePoker.asset.meta | 8 + .../TableSteel.asset | 16 + .../TableSteel.asset.meta | 8 + .../TableWood.asset | 16 + .../TableWood.asset.meta | 8 + .../WorldObjectAssetReferences/TileBar.asset | 16 + .../TileBar.asset.meta | 8 + .../TileDirt1.asset | 16 + .../TileDirt1.asset.meta | 8 + .../TileGrass.asset | 16 + .../TileGrass.asset.meta | 8 + .../WorldObjectAssetReferences/TileGrey.asset | 16 + .../TileGrey.asset.meta | 8 + .../TileGreyDark.asset | 16 + .../TileGreyDark.asset.meta | 8 + .../TileKitchen.asset | 16 + .../TileKitchen.asset.meta | 8 + .../TileOverlayBlue.asset | 16 + .../TileOverlayBlue.asset.meta | 8 + .../TileOverlayBrown.asset | 16 + .../TileOverlayBrown.asset.meta | 8 + .../TileOverlayGreen.asset | 16 + .../TileOverlayGreen.asset.meta | 8 + .../TileOverlayOrange.asset | 16 + .../TileOverlayOrange.asset.meta | 8 + .../TileOverlayPurple.asset | 16 + .../TileOverlayPurple.asset.meta | 8 + .../TileOverlayRed.asset | 16 + .../TileOverlayRed.asset.meta | 8 + .../TilePlating.asset | 16 + .../TilePlating.asset.meta | 8 + .../TileReinforced.asset | 16 + .../TileReinforced.asset.meta | 8 + .../TileWhite.asset | 16 + .../TileWhite.asset.meta | 8 + .../WorldObjectAssetReferences/TileWood.asset | 16 + .../TileWood.asset.meta | 8 + .../VendorHotDrinks.asset | 16 + .../VendorHotDrinks.asset.meta | 8 + .../VendorRobustSoftdrinks.asset | 16 + .../VendorRobustSoftdrinks.asset.meta | 8 + .../VendorSecTech.asset | 16 + .../VendorSecTech.asset.meta | 8 + .../VendorYouTool.asset | 16 + .../VendorYouTool.asset.meta | 8 + .../WorldObjectAssetReferences/Vent.asset | 16 + .../Vent.asset.meta | 8 + .../WaterCooler.asset | 16 + .../WaterCooler.asset.meta | 8 + .../WaterTank.asset | 16 + .../WaterTank.asset.meta | 8 + Assets/Scripts/SS3D/Data/Generated/Items.cs | 82 +++++ 320 files changed, 2931 insertions(+), 103 deletions(-) create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/APC.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Blender.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Cables.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Locker.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SMES.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Sink.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Vent.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta diff --git a/Assets/Content/Addressables/AssetGroups/Items.asset b/Assets/Content/Addressables/AssetGroups/Items.asset index b0e9d16cd0..442bd3379b 100644 --- a/Assets/Content/Addressables/AssetGroups/Items.asset +++ b/Assets/Content/Addressables/AssetGroups/Items.asset @@ -385,6 +385,334 @@ MonoBehaviour: m_Address: Assets/Content/WorldObjects/Items/Clothing/ShoeJackboots.prefab m_ReadOnly: 0 m_SerializedLabels: [] + - m_GUID: fdaaabc96a55d824a86a3636906240c1 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Posters/Horizontal/PosterHorizontal.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 85fa4c9b76b4b23458dcf24a745a1dfe + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/DinnerBooth.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 5e24183c4537dcf47b16fde5ab1ce0ea + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayRed.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 4d48472d06930bd42a15897e6a1794ac + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableGlass.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: ebddb1721dcbe36499e4d093e5a7ff09 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TablePoker.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 75680e6a1df5ff547bdb5b8f116f766b + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileBar.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: bdeac5e9a27546348a584caa74f00ec7 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/MachineFrame.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d32855055305ce5489c69379e2219a7d + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/PowerCellCharger.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7c6bebf2e12702d48abd76acad4d1272 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Supply/DisposalOutlet.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 98ce0a84deb394b4bbd18f31f368317c + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Lights/LightBulbFixture.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: a777a6da30f0704478e25312963a8151 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Mirror.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: fa1909e0d40b4cf408ff599df7a2043f + m_Address: Assets/Content/WorldObjects/Furniture/Storage/Lockers/Locker.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 854451834f026fb4f860bf0e977a104c + m_Address: Assets/Content/WorldObjects/Structures/Floors/Lattice.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 5a09b3e93f0022b468da150e3c4a78c6 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Kitchen/Blender.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 3a25eb0bd251b5847af05fb59feff383 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7a47e5b68d8bab647b3f99ee3af524c7 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileGrey.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 081d9ee3e54295d49a4970a88f4943a9 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Medical/Cryotube.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 8686fbdb413e33b4395a775c4f2ba990 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/TilePlating.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 50405f05821f58c49a8badc89506b019 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/SolarTrackingBeacon.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 6f2976f635940684da7f7f4ed7855a8d + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Vendors/VendorSecTech.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 5ecf13819099b014eb5f731155540586 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileKitchen.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 821d0946be816bb42a0eed24631d57ee + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayBlue.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: add4d1bc2d874d94782d6b8c912af5e2 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/NukeCart.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 4a1bd08646e8e1f4a861960d9b7485f8 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7a895b269e3f67241af148d25331f5af + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Office/OfficeChair.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: dd3ce5340ed4aba4babae7020f737084 + m_Address: Assets/Content/WorldObjects/Furniture/Storage/Lockers/SecurityLocker.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 6873d7cf62d6ebc42966423161b799f1 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileGreyDark.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 8ae2f499d25bfcd41bf26b735c852ab1 + m_Address: Assets/Content/WorldObjects/Furniture/Flora/PottedPlants/Plant7.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: de6f06ad18d50134295959f438ba9c5d + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Atmospherics/AtmosPipesL1.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 9b8a1328991fc2846bc55a3d9a82e5c0 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Carpet/FancyCarpetRed.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 66f6206faf2f7fb4a993d935c83fc239 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Lights/LightTubeFixture.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: e9009aff81f29eb429148fd71961539f + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableFrameSteel.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 1e0936c2ffa28eb419deda61c5c1cb8a + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Sink.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 12a989ad41a83a3468d1ae9aff9628d3 + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Disposals/DisposalPipes.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: be5174cd6c3daf64a9739aff0f747a91 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Atmospherics/Scrubber/Scrubber.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 829e74fee2b909242821055cc2b096e0 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Medical/ChemicalDispenser.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: df4cf328d472de046bcbc073cbda2868 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Reinforced/TileReinforced.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: b7976a98a25be4543ba45f1d5e26c072 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Vendors/VendorHotDrinks.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 84a5596b28f449e49bb34741abf89d30 + m_Address: Assets/Content/WorldObjects/Structures/Doors/CivillianAirlock.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 9f028e95d4196b141acf363c01d24806 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Generic/SlotMachine.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 11d64ed349b96ec4780c4dda0ad89daf + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Kitchen/Microwave.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d675e0c37e3147a4b8501314b5106f13 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Generic/Tanks/WaterTank.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 14df766b77b0daf4b82ad93125f66782 + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayPurple.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7b74e45100446b440b4b0a12cd6d05ef + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Kitchen/TableBoozeDispenser.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 49f2097d4710d114a89821d9164dfce2 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Wood/TileWood.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: cc1b7e8558e50594089a64af537ff781 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Vendors/VendorYouTool.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 330d85a67a5891145bd8037dde90f37b + m_Address: Assets/Content/WorldObjects/Furniture/Storage/Lockers/LockerSecure.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7e7706a54d61daa47857aadd94b37002 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 672b544ba53de0144aab307a16b085cb + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableFrameWood.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 61201f10ccc2856459a9de99d9cdc52e + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileWhite.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 3a7b793253e1a0f4587097192998c361 + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayBrown.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: ad124dd2ec7d83344a20a44fad208ca0 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 5e8a02c5ce0073644ac01bdb55d72a70 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableWood.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 23a169aefca62c4418b6efec13df595e + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Supply/DisposalBin.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: f0eca2b8867709749bc10f61917c4bdf + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/SolarPanel.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 501391c27a7f94c4d8c937f00a9ceb9f + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Grass/TileGrass.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 6caa99f8281726e40a793826d5c047db + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableSteel.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 45cc43b84ee58e644b9523cb27682b39 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/PacManGenerator.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 11a2276338ebc64429dfc565b491e437 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/AirAlarm.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 51049866c35db47418dfe5e78bee76e7 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: b38ae683afaacc4419ac13936cecd1a5 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/SMES.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 852d57bdb0508494fb6047f36e813c69 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Generic/Tanks/FuelTank.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 93faf7e7a5c67b9478c57a0d03340256 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Vendors/VendorRobustSoftdrinks.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: adc07a7f0fee8304691f45a201509b13 + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Atmospherics/AtmosPipesL3.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d25b39d1e2379b64cba47629530ada78 + m_Address: Assets/Content/WorldObjects/Structures/Doors/SecurityAirlock.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d27600b4734eb3a4284be037a2f9d02b + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Medical/SleeperBed.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 0d6ab6288624c7348bdcbfb81d07088f + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Posters/Vertical/PosterVertical.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 251dc2a5fbda518429c8205c3b62165f + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Atmospherics/AtmosPipesL2.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d07b5fba3896ff448855d6e54356c365 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/LightSwitch.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 8dc5399c58290d54f9a6cc2f6c1c9d9f + m_Address: Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 0188e95eec8518246940499957802de9 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/WaterCooler.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 48efd00c91c310e4bb965d025c63b3ba + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Atmospherics/AtmosPipesL4.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: ad055c3d74a711a4b9d9b31217883a03 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Kitchen/Gibber.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 50dd6be959d44844ab1abf8a3f2adb01 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/FireAlarm.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 6cd51fc127b8aac40b2accd3e2666202 + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayOrange.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 4c966398d6624164c910cd29c1faa980 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/APC.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: b3e652487789fe54d8d24245d5962c3a + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayGreen.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 0ef9cea3bb74e6c4788f77e711f92d4d + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Dirt/TileDirt1.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 92d3eb280886ba74cb1e19f4e01669a7 + m_Address: Assets/Content/WorldObjects/Structures/Wires/Cables.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 41d7af24659a0d3439668aeb4c46d9bc + m_Address: Assets/Content/WorldObjects/Furniture/Flora/PottedPlants/Plant0.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: a28267798293970468ab30803632a3f7 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Catwalk.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: bb2ccbe283c7a7d459f283a7483e04b9 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Atmospherics/Vent/Vent.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: ddc57d0f5f9fb874e8a26db0c5b215e0, type: 2} m_SchemaSet: diff --git a/Assets/Content/Data/Databases/Items.asset b/Assets/Content/Data/Databases/Items.asset index 22e0d86fa1..5b9ff50aac 100644 --- a/Assets/Content/Data/Databases/Items.asset +++ b/Assets/Content/Data/Databases/Items.asset @@ -201,4 +201,168 @@ MonoBehaviour: _value: {fileID: 930591319891399865, guid: 81faf4debf00a0a478b924176f48d011, type: 3} - _key: 535ed7c02b5cbdc43ae2b234a963c5cc _value: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} + - _key: fdaaabc96a55d824a86a3636906240c1 + _value: {fileID: 5161561551087789900, guid: fdaaabc96a55d824a86a3636906240c1, type: 3} + - _key: 85fa4c9b76b4b23458dcf24a745a1dfe + _value: {fileID: 8085678556641831659, guid: 85fa4c9b76b4b23458dcf24a745a1dfe, type: 3} + - _key: 5e24183c4537dcf47b16fde5ab1ce0ea + _value: {fileID: 6767447678079105841, guid: 5e24183c4537dcf47b16fde5ab1ce0ea, type: 3} + - _key: 4d48472d06930bd42a15897e6a1794ac + _value: {fileID: 2839728781945606427, guid: 4d48472d06930bd42a15897e6a1794ac, type: 3} + - _key: ebddb1721dcbe36499e4d093e5a7ff09 + _value: {fileID: 3879826479501069436, guid: ebddb1721dcbe36499e4d093e5a7ff09, type: 3} + - _key: 75680e6a1df5ff547bdb5b8f116f766b + _value: {fileID: 6767447678079105841, guid: 75680e6a1df5ff547bdb5b8f116f766b, type: 3} + - _key: bdeac5e9a27546348a584caa74f00ec7 + _value: {fileID: 5860930364823099125, guid: bdeac5e9a27546348a584caa74f00ec7, type: 3} + - _key: d32855055305ce5489c69379e2219a7d + _value: {fileID: 4094910103892312607, guid: d32855055305ce5489c69379e2219a7d, type: 3} + - _key: 7c6bebf2e12702d48abd76acad4d1272 + _value: {fileID: 2658310835758749969, guid: 7c6bebf2e12702d48abd76acad4d1272, type: 3} + - _key: 98ce0a84deb394b4bbd18f31f368317c + _value: {fileID: 4866668043303595546, guid: 98ce0a84deb394b4bbd18f31f368317c, type: 3} + - _key: a777a6da30f0704478e25312963a8151 + _value: {fileID: 4866668043303595546, guid: a777a6da30f0704478e25312963a8151, type: 3} + - _key: fa1909e0d40b4cf408ff599df7a2043f + _value: {fileID: 5533951594911835035, guid: fa1909e0d40b4cf408ff599df7a2043f, type: 3} + - _key: 854451834f026fb4f860bf0e977a104c + _value: {fileID: 7825286949101219487, guid: 854451834f026fb4f860bf0e977a104c, type: 3} + - _key: 5a09b3e93f0022b468da150e3c4a78c6 + _value: {fileID: 1918783493706165866, guid: 5a09b3e93f0022b468da150e3c4a78c6, type: 3} + - _key: 3a25eb0bd251b5847af05fb59feff383 + _value: {fileID: 1694330674204457255, guid: 3a25eb0bd251b5847af05fb59feff383, type: 3} + - _key: 7a47e5b68d8bab647b3f99ee3af524c7 + _value: {fileID: 6767447678079105841, guid: 7a47e5b68d8bab647b3f99ee3af524c7, type: 3} + - _key: 081d9ee3e54295d49a4970a88f4943a9 + _value: {fileID: 3366070093996439494, guid: 081d9ee3e54295d49a4970a88f4943a9, type: 3} + - _key: 8686fbdb413e33b4395a775c4f2ba990 + _value: {fileID: 6767447678079105841, guid: 8686fbdb413e33b4395a775c4f2ba990, type: 3} + - _key: 50405f05821f58c49a8badc89506b019 + _value: {fileID: 1918783493706165866, guid: 50405f05821f58c49a8badc89506b019, type: 3} + - _key: 6f2976f635940684da7f7f4ed7855a8d + _value: {fileID: 2658310835758749969, guid: 6f2976f635940684da7f7f4ed7855a8d, type: 3} + - _key: 5ecf13819099b014eb5f731155540586 + _value: {fileID: 6767447678079105841, guid: 5ecf13819099b014eb5f731155540586, type: 3} + - _key: 821d0946be816bb42a0eed24631d57ee + _value: {fileID: 6767447678079105841, guid: 821d0946be816bb42a0eed24631d57ee, type: 3} + - _key: add4d1bc2d874d94782d6b8c912af5e2 + _value: {fileID: 2658310835758749969, guid: add4d1bc2d874d94782d6b8c912af5e2, type: 3} + - _key: 4a1bd08646e8e1f4a861960d9b7485f8 + _value: {fileID: 5161561551087789900, guid: 4a1bd08646e8e1f4a861960d9b7485f8, type: 3} + - _key: 7a895b269e3f67241af148d25331f5af + _value: {fileID: 5161561551087789900, guid: 7a895b269e3f67241af148d25331f5af, type: 3} + - _key: dd3ce5340ed4aba4babae7020f737084 + _value: {fileID: 5533951594911835035, guid: dd3ce5340ed4aba4babae7020f737084, type: 3} + - _key: 6873d7cf62d6ebc42966423161b799f1 + _value: {fileID: 5554428447677395221, guid: 6873d7cf62d6ebc42966423161b799f1, type: 3} + - _key: 8ae2f499d25bfcd41bf26b735c852ab1 + _value: {fileID: 4182798096333233391, guid: 8ae2f499d25bfcd41bf26b735c852ab1, type: 3} + - _key: de6f06ad18d50134295959f438ba9c5d + _value: {fileID: 2802364579275783218, guid: de6f06ad18d50134295959f438ba9c5d, type: 3} + - _key: 9b8a1328991fc2846bc55a3d9a82e5c0 + _value: {fileID: 3591147544166670882, guid: 9b8a1328991fc2846bc55a3d9a82e5c0, type: 3} + - _key: 66f6206faf2f7fb4a993d935c83fc239 + _value: {fileID: 4866668043303595546, guid: 66f6206faf2f7fb4a993d935c83fc239, type: 3} + - _key: e9009aff81f29eb429148fd71961539f + _value: {fileID: 3879826479501069436, guid: e9009aff81f29eb429148fd71961539f, type: 3} + - _key: 1e0936c2ffa28eb419deda61c5c1cb8a + _value: {fileID: 1918783493706165866, guid: 1e0936c2ffa28eb419deda61c5c1cb8a, type: 3} + - _key: 12a989ad41a83a3468d1ae9aff9628d3 + _value: {fileID: 2802364579275783218, guid: 12a989ad41a83a3468d1ae9aff9628d3, type: 3} + - _key: be5174cd6c3daf64a9739aff0f747a91 + _value: {fileID: 9154955770433736351, guid: be5174cd6c3daf64a9739aff0f747a91, type: 3} + - _key: 829e74fee2b909242821055cc2b096e0 + _value: {fileID: 2314780735993174911, guid: 829e74fee2b909242821055cc2b096e0, type: 3} + - _key: df4cf328d472de046bcbc073cbda2868 + _value: {fileID: 8597721773267636030, guid: df4cf328d472de046bcbc073cbda2868, type: 3} + - _key: b7976a98a25be4543ba45f1d5e26c072 + _value: {fileID: 2658310835758749969, guid: b7976a98a25be4543ba45f1d5e26c072, type: 3} + - _key: 84a5596b28f449e49bb34741abf89d30 + _value: {fileID: 7133738675197207439, guid: 84a5596b28f449e49bb34741abf89d30, type: 3} + - _key: 9f028e95d4196b141acf363c01d24806 + _value: {fileID: 2979169873714900079, guid: 9f028e95d4196b141acf363c01d24806, type: 3} + - _key: 11d64ed349b96ec4780c4dda0ad89daf + _value: {fileID: 1918783493706165866, guid: 11d64ed349b96ec4780c4dda0ad89daf, type: 3} + - _key: d675e0c37e3147a4b8501314b5106f13 + _value: {fileID: 2473656465330762349, guid: d675e0c37e3147a4b8501314b5106f13, type: 3} + - _key: 14df766b77b0daf4b82ad93125f66782 + _value: {fileID: 6767447678079105841, guid: 14df766b77b0daf4b82ad93125f66782, type: 3} + - _key: 7b74e45100446b440b4b0a12cd6d05ef + _value: {fileID: 1918783493706165866, guid: 7b74e45100446b440b4b0a12cd6d05ef, type: 3} + - _key: 49f2097d4710d114a89821d9164dfce2 + _value: {fileID: 6767447678079105841, guid: 49f2097d4710d114a89821d9164dfce2, type: 3} + - _key: cc1b7e8558e50594089a64af537ff781 + _value: {fileID: 2658310835758749969, guid: cc1b7e8558e50594089a64af537ff781, type: 3} + - _key: 330d85a67a5891145bd8037dde90f37b + _value: {fileID: 5533951594911835035, guid: 330d85a67a5891145bd8037dde90f37b, type: 3} + - _key: 7e7706a54d61daa47857aadd94b37002 + _value: {fileID: 425175355485335577, guid: 7e7706a54d61daa47857aadd94b37002, type: 3} + - _key: 672b544ba53de0144aab307a16b085cb + _value: {fileID: 3879826479501069436, guid: 672b544ba53de0144aab307a16b085cb, type: 3} + - _key: 61201f10ccc2856459a9de99d9cdc52e + _value: {fileID: 6767447678079105841, guid: 61201f10ccc2856459a9de99d9cdc52e, type: 3} + - _key: 3a7b793253e1a0f4587097192998c361 + _value: {fileID: 6767447678079105841, guid: 3a7b793253e1a0f4587097192998c361, type: 3} + - _key: ad124dd2ec7d83344a20a44fad208ca0 + _value: {fileID: 4522437496122700672, guid: ad124dd2ec7d83344a20a44fad208ca0, type: 3} + - _key: 5e8a02c5ce0073644ac01bdb55d72a70 + _value: {fileID: 3879826479501069436, guid: 5e8a02c5ce0073644ac01bdb55d72a70, type: 3} + - _key: 23a169aefca62c4418b6efec13df595e + _value: {fileID: 2658310835758749969, guid: 23a169aefca62c4418b6efec13df595e, type: 3} + - _key: f0eca2b8867709749bc10f61917c4bdf + _value: {fileID: 941367499997148975, guid: f0eca2b8867709749bc10f61917c4bdf, type: 3} + - _key: 501391c27a7f94c4d8c937f00a9ceb9f + _value: {fileID: 6767447678079105841, guid: 501391c27a7f94c4d8c937f00a9ceb9f, type: 3} + - _key: 6caa99f8281726e40a793826d5c047db + _value: {fileID: 8036950609662249464, guid: 6caa99f8281726e40a793826d5c047db, type: 3} + - _key: 45cc43b84ee58e644b9523cb27682b39 + _value: {fileID: 1918783493706165866, guid: 45cc43b84ee58e644b9523cb27682b39, type: 3} + - _key: 11a2276338ebc64429dfc565b491e437 + _value: {fileID: 6961426338783081091, guid: 11a2276338ebc64429dfc565b491e437, type: 3} + - _key: 51049866c35db47418dfe5e78bee76e7 + _value: {fileID: 2552998557361554814, guid: 51049866c35db47418dfe5e78bee76e7, type: 3} + - _key: b38ae683afaacc4419ac13936cecd1a5 + _value: {fileID: 1918783493706165866, guid: b38ae683afaacc4419ac13936cecd1a5, type: 3} + - _key: 852d57bdb0508494fb6047f36e813c69 + _value: {fileID: 1918783493706165866, guid: 852d57bdb0508494fb6047f36e813c69, type: 3} + - _key: 93faf7e7a5c67b9478c57a0d03340256 + _value: {fileID: 2658310835758749969, guid: 93faf7e7a5c67b9478c57a0d03340256, type: 3} + - _key: adc07a7f0fee8304691f45a201509b13 + _value: {fileID: 2802364579275783218, guid: adc07a7f0fee8304691f45a201509b13, type: 3} + - _key: d25b39d1e2379b64cba47629530ada78 + _value: {fileID: 7133738675197207439, guid: d25b39d1e2379b64cba47629530ada78, type: 3} + - _key: d27600b4734eb3a4284be037a2f9d02b + _value: {fileID: 7357446777869910137, guid: d27600b4734eb3a4284be037a2f9d02b, type: 3} + - _key: 0d6ab6288624c7348bdcbfb81d07088f + _value: {fileID: 5927714388255546572, guid: 0d6ab6288624c7348bdcbfb81d07088f, type: 3} + - _key: 251dc2a5fbda518429c8205c3b62165f + _value: {fileID: 2802364579275783218, guid: 251dc2a5fbda518429c8205c3b62165f, type: 3} + - _key: d07b5fba3896ff448855d6e54356c365 + _value: {fileID: 4866668043303595546, guid: d07b5fba3896ff448855d6e54356c365, type: 3} + - _key: 8dc5399c58290d54f9a6cc2f6c1c9d9f + _value: {fileID: 6118765911134750290, guid: 8dc5399c58290d54f9a6cc2f6c1c9d9f, type: 3} + - _key: 0188e95eec8518246940499957802de9 + _value: {fileID: 260173893888736664, guid: 0188e95eec8518246940499957802de9, type: 3} + - _key: 48efd00c91c310e4bb965d025c63b3ba + _value: {fileID: 2802364579275783218, guid: 48efd00c91c310e4bb965d025c63b3ba, type: 3} + - _key: ad055c3d74a711a4b9d9b31217883a03 + _value: {fileID: 8859943380013583148, guid: ad055c3d74a711a4b9d9b31217883a03, type: 3} + - _key: 50dd6be959d44844ab1abf8a3f2adb01 + _value: {fileID: 4866668043303595546, guid: 50dd6be959d44844ab1abf8a3f2adb01, type: 3} + - _key: 6cd51fc127b8aac40b2accd3e2666202 + _value: {fileID: 6767447678079105841, guid: 6cd51fc127b8aac40b2accd3e2666202, type: 3} + - _key: 4c966398d6624164c910cd29c1faa980 + _value: {fileID: 5287103069661579500, guid: 4c966398d6624164c910cd29c1faa980, type: 3} + - _key: b3e652487789fe54d8d24245d5962c3a + _value: {fileID: 6767447678079105841, guid: b3e652487789fe54d8d24245d5962c3a, type: 3} + - _key: 0ef9cea3bb74e6c4788f77e711f92d4d + _value: {fileID: 6767447678079105841, guid: 0ef9cea3bb74e6c4788f77e711f92d4d, type: 3} + - _key: 92d3eb280886ba74cb1e19f4e01669a7 + _value: {fileID: 2802364579275783218, guid: 92d3eb280886ba74cb1e19f4e01669a7, type: 3} + - _key: 41d7af24659a0d3439668aeb4c46d9bc + _value: {fileID: 4182798096333233391, guid: 41d7af24659a0d3439668aeb4c46d9bc, type: 3} + - _key: a28267798293970468ab30803632a3f7 + _value: {fileID: 8178185248287418974, guid: a28267798293970468ab30803632a3f7, type: 3} + - _key: bb2ccbe283c7a7d459f283a7483e04b9 + _value: {fileID: 9154955770433736351, guid: bb2ccbe283c7a7d459f283a7483e04b9, type: 3} _new: diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant0.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant0.asset index 9d5bb2f4cc..40199d4d4b 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant0.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant0.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Plant0 m_EditorClassIdentifier: - nameString: plant0 prefab: {fileID: 4182798096333233391, guid: 41d7af24659a0d3439668aeb4c46d9bc, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7f81f6e487d7acc449f47ee1bb0c8cb7, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant7.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant7.asset index d8998b8303..c0c4cb2ccf 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant7.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant7.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Plant7 m_EditorClassIdentifier: - nameString: plant7 prefab: {fileID: 4182798096333233391, guid: 8ae2f499d25bfcd41bf26b735c852ab1, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9f69d24f5d22e8a4ebc1e60eb6c74d98, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/JukeboxBlueGreen.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/JukeboxBlueGreen.asset index 4d4d3f2939..c39215b46b 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/JukeboxBlueGreen.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/JukeboxBlueGreen.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: JukeboxBlueGreen m_EditorClassIdentifier: - nameString: JukeboxBlueGreen prefab: {fileID: 6118765911134750290, guid: 8dc5399c58290d54f9a6cc2f6c1c9d9f, type: 3} + PrefabAsset: {fileID: 11400000, guid: f7b11732c4258a14a99087cbbc175eab, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/NukeCart.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/NukeCart.asset index 92c5d349cd..9bcae77f55 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/NukeCart.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/NukeCart.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: NukeCart m_EditorClassIdentifier: - nameString: nuke_cart prefab: {fileID: 2658310835758749969, guid: add4d1bc2d874d94782d6b8c912af5e2, type: 3} + PrefabAsset: {fileID: 11400000, guid: 429460ce2249f9f438cf31c6ef35b298, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChair.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChair.asset index 9d6ea82f9c..f08960dabc 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChair.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChair.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: OfficeChair m_EditorClassIdentifier: - nameString: chair_office prefab: {fileID: 5161561551087789900, guid: 7a895b269e3f67241af148d25331f5af, type: 3} + PrefabAsset: {fileID: 11400000, guid: d9b535e0cb6122741bab6b987207a626, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.asset index 329c0fbc18..7048f49403 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: OfficeChairBlue m_EditorClassIdentifier: - nameString: chair_office_blue prefab: {fileID: 2552998557361554814, guid: 51049866c35db47418dfe5e78bee76e7, type: 3} + PrefabAsset: {fileID: 11400000, guid: cb3ca8be4114e4d409b3d69fae2f9428, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.asset index 0aa4152f7a..91ea750d05 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: OfficeChairGrey m_EditorClassIdentifier: - nameString: chair_office_grey prefab: {fileID: 425175355485335577, guid: 7e7706a54d61daa47857aadd94b37002, type: 3} + PrefabAsset: {fileID: 11400000, guid: d1ce84881d67528419ccb2f2947dc17c, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.asset index 917e463a83..02bb949601 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: PlasticChair m_EditorClassIdentifier: - nameString: chair_plastic prefab: {fileID: 5161561551087789900, guid: 4a1bd08646e8e1f4a861960d9b7485f8, type: 3} + PrefabAsset: {fileID: 11400000, guid: f62fbce52ff26fc449c2c38c1c759004, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.asset index fef22208ef..c0e4269a3c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: PlasticChairBlue m_EditorClassIdentifier: - nameString: chair_plastic_blue prefab: {fileID: 4522437496122700672, guid: ad124dd2ec7d83344a20a44fad208ca0, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8c0f778498a9baa4ebc43a943c97a314, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.asset index 9d37e7a92f..f77a0891c4 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: PlasticChairGrey m_EditorClassIdentifier: - nameString: chair_plastic_grey prefab: {fileID: 1694330674204457255, guid: 3a25eb0bd251b5847af05fb59feff383, type: 3} + PrefabAsset: {fileID: 11400000, guid: c830ff804dedfcb48aded18665c08225, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset index 25d401f247..b15b876217 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: DinnerBooth m_EditorClassIdentifier: - nameString: DinnerBooth prefab: {fileID: 8085678556641831659, guid: 85fa4c9b76b4b23458dcf24a745a1dfe, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4467e57350dc14745b7ef76c60fd8001, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 5 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Sink.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Sink.asset index de3aedd2cf..7aaa188040 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Sink.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Sink.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: Sink m_EditorClassIdentifier: prefab: {fileID: 1918783493706165866, guid: 1e0936c2ffa28eb419deda61c5c1cb8a, type: 3} + PrefabAsset: {fileID: 11400000, guid: b0b8c9665d651934382cdad26ffa8081, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameSteel.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameSteel.asset index 548ecee1e3..a4629a60bf 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameSteel.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameSteel.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableFrameSteel m_EditorClassIdentifier: - nameString: tableframe_steel prefab: {fileID: 3879826479501069436, guid: e9009aff81f29eb429148fd71961539f, type: 3} + PrefabAsset: {fileID: 11400000, guid: c4e3ed17ef66be443b04296dab2a7ae5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameWood.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameWood.asset index a15e330115..865eac9ce7 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameWood.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameWood.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableFrameWood m_EditorClassIdentifier: - nameString: tableframe_wood prefab: {fileID: 3879826479501069436, guid: 672b544ba53de0144aab307a16b085cb, type: 3} + PrefabAsset: {fileID: 11400000, guid: a7a0afa03215be246be78ab71e2e2571, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 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 index 5f181fcd2f..bb148cc14c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableGlass.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableGlass.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableGlass m_EditorClassIdentifier: - nameString: table_glass prefab: {fileID: 2839728781945606427, guid: 4d48472d06930bd42a15897e6a1794ac, type: 3} + PrefabAsset: {fileID: 11400000, guid: 57eec9e75508e354f8d240e6c7dfc96a, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 7 specificType: 1 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TablePoker.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TablePoker.asset index ad50653bbf..e4823a7fa3 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TablePoker.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TablePoker.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TablePoker m_EditorClassIdentifier: - nameString: table_poker prefab: {fileID: 3879826479501069436, guid: ebddb1721dcbe36499e4d093e5a7ff09, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3ba25a1b639ddcd489a491e3bbc3eb03, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 7 specificType: 2 width: 1 height: 1 + isLarge: 0 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 index 0f2e7072ea..2bc815e71d 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableSteel.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableSteel.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableSteel m_EditorClassIdentifier: - nameString: table_steel prefab: {fileID: 8036950609662249464, guid: 6caa99f8281726e40a793826d5c047db, type: 3} + PrefabAsset: {fileID: 11400000, guid: f3930eec4b86e7746a89c6c716e27798, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 7 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableWood.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableWood.asset index c8aa45c947..6460f4146c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableWood.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableWood.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableWood m_EditorClassIdentifier: - nameString: table_wood prefab: {fileID: 3879826479501069436, guid: 5e8a02c5ce0073644ac01bdb55d72a70, type: 3} + PrefabAsset: {fileID: 11400000, guid: 00bc0b62e52334e43b318cac04a821cf, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 7 specificType: 4 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/WaterCooler.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/WaterCooler.asset index 9ae5449342..ebe213df1c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/WaterCooler.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/WaterCooler.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: WaterCooler m_EditorClassIdentifier: - nameString: water_cooler prefab: {fileID: 260173893888736664, guid: 0188e95eec8518246940499957802de9, type: 3} + PrefabAsset: {fileID: 11400000, guid: e00ebdb1aa55d3a40ab6a8c03d1d0529, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Scrubber.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Scrubber.asset index ca3ce3e097..5114e9dcbd 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Scrubber.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Scrubber.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Scrubber m_EditorClassIdentifier: - nameString: scrubber prefab: {fileID: 9154955770433736351, guid: be5174cd6c3daf64a9739aff0f747a91, type: 3} + PrefabAsset: {fileID: 11400000, guid: b10b6c6238a5a814ba6737bfa63bc4c3, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Vent.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Vent.asset index bcbff1ce5e..4646952885 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Vent.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Vent.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Vent m_EditorClassIdentifier: - nameString: vent prefab: {fileID: 9154955770433736351, guid: bb2ccbe283c7a7d459f283a7483e04b9, type: 3} + PrefabAsset: {fileID: 11400000, guid: c05dfac29f4de184e8dcb9be586d1d72, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PacManGenerator.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PacManGenerator.asset index a02cd38ffb..7786b2c2c8 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PacManGenerator.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PacManGenerator.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: PacManGenerator m_EditorClassIdentifier: - nameString: PacManGenerator prefab: {fileID: 1918783493706165866, guid: 45cc43b84ee58e644b9523cb27682b39, type: 3} + PrefabAsset: {fileID: 11400000, guid: 70c5d3dd9aae4924ca510544b02d153f, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PowerCellCharger.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PowerCellCharger.asset index a7a5d19ef1..2fcb17dcea 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PowerCellCharger.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PowerCellCharger.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: PowerCellCharger m_EditorClassIdentifier: prefab: {fileID: 4094910103892312607, guid: d32855055305ce5489c69379e2219a7d, type: 3} + PrefabAsset: {fileID: 11400000, guid: 927209024a2e722458a308e2433956cb, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SMES.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SMES.asset index 669e0d6920..70e1c61632 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SMES.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SMES.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SMES m_EditorClassIdentifier: - nameString: SMES prefab: {fileID: 1918783493706165866, guid: b38ae683afaacc4419ac13936cecd1a5, type: 3} + PrefabAsset: {fileID: 11400000, guid: 2b02816e423698b4590effe2b46616a4, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarPanel.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarPanel.asset index 504bfe3455..741014a737 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarPanel.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarPanel.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: SolarPanel m_EditorClassIdentifier: prefab: {fileID: 941367499997148975, guid: f0eca2b8867709749bc10f61917c4bdf, type: 3} + PrefabAsset: {fileID: 11400000, guid: 38fc09810330bbd4bba345e3f9592199, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarTrackingBeacon.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarTrackingBeacon.asset index 3b8ad57b4b..d917319a73 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarTrackingBeacon.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarTrackingBeacon.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SolarTrackingBeacon m_EditorClassIdentifier: - nameString: SolarTrackingBeacon prefab: {fileID: 1918783493706165866, guid: 50405f05821f58c49a8badc89506b019, type: 3} + PrefabAsset: {fileID: 11400000, guid: b27d3b93e8709f840a9f1aab59a9cc75, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/SlotMachine.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/SlotMachine.asset index e7b7db10c0..cb188f39d9 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/SlotMachine.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/SlotMachine.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: SlotMachine m_EditorClassIdentifier: prefab: {fileID: 2979169873714900079, guid: 9f028e95d4196b141acf363c01d24806, type: 3} + PrefabAsset: {fileID: 11400000, guid: ad014a0995d51f64992e3022889cf64d, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/FuelTank.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/FuelTank.asset index 8e3ddb9e16..afc86d129b 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/FuelTank.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/FuelTank.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: FuelTank m_EditorClassIdentifier: prefab: {fileID: 1918783493706165866, guid: 852d57bdb0508494fb6047f36e813c69, type: 3} + PrefabAsset: {fileID: 11400000, guid: 96ca9ccd597fc434d8b4c00f1143ebee, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/WaterTank.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/WaterTank.asset index 87559ca696..f1607e7231 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/WaterTank.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/WaterTank.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: WaterTank m_EditorClassIdentifier: prefab: {fileID: 2473656465330762349, guid: d675e0c37e3147a4b8501314b5106f13, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3b3e7d5b83122c048bf3679e7e38edd2, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Blender.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Blender.asset index 3c89808a60..45ff0c1eca 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Blender.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Blender.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Blender m_EditorClassIdentifier: - nameString: blender prefab: {fileID: 1918783493706165866, guid: 5a09b3e93f0022b468da150e3c4a78c6, type: 3} + PrefabAsset: {fileID: 11400000, guid: c106e3753ddf7bf478a44b1b84e29a75, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Gibber.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Gibber.asset index b915ae8ab2..2ee659fd58 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Gibber.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Gibber.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: Gibber m_EditorClassIdentifier: prefab: {fileID: 8859943380013583148, guid: ad055c3d74a711a4b9d9b31217883a03, type: 3} + PrefabAsset: {fileID: 11400000, guid: b207b8ee084b79b4596fdecc5de5c8dd, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Microwave.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Microwave.asset index a13d60c42b..f6433cbcea 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Microwave.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Microwave.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Microwave m_EditorClassIdentifier: - nameString: microwave prefab: {fileID: 1918783493706165866, guid: 11d64ed349b96ec4780c4dda0ad89daf, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6dc7a600d222dc644ae89ef4a09f9b8d, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/TableBoozeDispenser.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/TableBoozeDispenser.asset index 857ea8f7ed..520640b9c7 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/TableBoozeDispenser.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/TableBoozeDispenser.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableBoozeDispenser m_EditorClassIdentifier: - nameString: boozedispenser_table prefab: {fileID: 1918783493706165866, guid: 7b74e45100446b440b4b0a12cd6d05ef, type: 3} + PrefabAsset: {fileID: 11400000, guid: a73deecf4da493441be493a67fe479ba, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/MachineFrame.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/MachineFrame.asset index 91f4d7bd77..0f2e57571e 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/MachineFrame.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/MachineFrame.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: MachineFrame m_EditorClassIdentifier: prefab: {fileID: 5860930364823099125, guid: bdeac5e9a27546348a584caa74f00ec7, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7965545d91b399842b227ff775f06b33, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/ChemicalDispenser.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/ChemicalDispenser.asset index 3949f2330f..4a8c5b9187 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/ChemicalDispenser.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/ChemicalDispenser.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: ChemicalDispenser m_EditorClassIdentifier: prefab: {fileID: 2314780735993174911, guid: 829e74fee2b909242821055cc2b096e0, type: 3} + PrefabAsset: {fileID: 11400000, guid: d1f5ecddf221c1a47982808266f2070c, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/Cryotube.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/Cryotube.asset index e791bebb8f..770e3659c9 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/Cryotube.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/Cryotube.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: Cryotube m_EditorClassIdentifier: prefab: {fileID: 3366070093996439494, guid: 081d9ee3e54295d49a4970a88f4943a9, type: 3} + PrefabAsset: {fileID: 11400000, guid: 47922ffa76b90df46b58005fe77de084, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/SleeperBed.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/SleeperBed.asset index 5992c452f7..dc0c66d6b6 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/SleeperBed.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/SleeperBed.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: SleeperBed m_EditorClassIdentifier: prefab: {fileID: 7357446777869910137, guid: d27600b4734eb3a4284be037a2f9d02b, type: 3} + PrefabAsset: {fileID: 11400000, guid: ba51a5776f8c1d942925425a344831a5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalBin.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalBin.asset index 988ba59f74..f948537f53 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalBin.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalBin.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: DisposalBin m_EditorClassIdentifier: - nameString: disposal_bin prefab: {fileID: 2658310835758749969, guid: 23a169aefca62c4418b6efec13df595e, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4e13680fe42def4449c8d79dc3318818, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalOutlet.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalOutlet.asset index 0ba5d0524d..8531c853a4 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalOutlet.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalOutlet.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: DisposalOutlet m_EditorClassIdentifier: - nameString: disposal_outlet prefab: {fileID: 2658310835758749969, guid: 7c6bebf2e12702d48abd76acad4d1272, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6fa242ef9bd905b4b8ba6b969a50c17e, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorHotDrinks.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorHotDrinks.asset index 8d4c0855c3..b266167453 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorHotDrinks.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorHotDrinks.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: VendorHotDrinks m_EditorClassIdentifier: - nameString: vendor_hotdrinks prefab: {fileID: 2658310835758749969, guid: b7976a98a25be4543ba45f1d5e26c072, type: 3} + PrefabAsset: {fileID: 11400000, guid: 147f3795b10839d4cbcc1d34086d1b1f, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorRobustSoftdrinks.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorRobustSoftdrinks.asset index 6247179e29..9e73eb7e0f 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorRobustSoftdrinks.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorRobustSoftdrinks.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: VendorRobustSoftdrinks m_EditorClassIdentifier: - nameString: vendor_robustsoftdrinks prefab: {fileID: 2658310835758749969, guid: 93faf7e7a5c67b9478c57a0d03340256, type: 3} + PrefabAsset: {fileID: 11400000, guid: 2bef70bf5ad92da45afa079fa69185b5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorSecTech.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorSecTech.asset index 7e609c0699..7d7e87ddc0 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorSecTech.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorSecTech.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: VendorSecTech m_EditorClassIdentifier: - nameString: vendor_sectech prefab: {fileID: 2658310835758749969, guid: 6f2976f635940684da7f7f4ed7855a8d, type: 3} + PrefabAsset: {fileID: 11400000, guid: 32c17bc4bdd2e8a43a4957440b5a1822, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorYouTool.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorYouTool.asset index 93385b4a8c..270a406b1c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorYouTool.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorYouTool.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: VendorYouTool m_EditorClassIdentifier: - nameString: vendor_youtool prefab: {fileID: 2658310835758749969, guid: cc1b7e8558e50594089a64af537ff781, type: 3} + PrefabAsset: {fileID: 11400000, guid: f4e9603aa7cef9341be50d058b95d0d5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/Locker.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/Locker.asset index 1d1d31773d..34c305dd41 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/Locker.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/Locker.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Locker m_EditorClassIdentifier: - nameString: locker prefab: {fileID: 5533951594911835035, guid: fa1909e0d40b4cf408ff599df7a2043f, type: 3} + PrefabAsset: {fileID: 11400000, guid: f994423a5d0fd1e41858be3166101149, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecureLocker.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecureLocker.asset index 99bd606e08..321bc60909 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecureLocker.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecureLocker.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SecureLocker m_EditorClassIdentifier: - nameString: locker_secure prefab: {fileID: 5533951594911835035, guid: 330d85a67a5891145bd8037dde90f37b, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3804d158eb924df468d8ebd0c01da9bb, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecurityLocker.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecurityLocker.asset index 7fb5b52d1d..1fb830e3d3 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecurityLocker.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecurityLocker.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SecurityLocker m_EditorClassIdentifier: - nameString: locker_security prefab: {fileID: 5533951594911835035, guid: dd3ce5340ed4aba4babae7020f737084, type: 3} + PrefabAsset: {fileID: 11400000, guid: 534d22d36c7a7df49adb294f3e2118a5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Backpack.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Backpack.asset index 8a8ae84c0f..30999c216f 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Backpack.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Backpack.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Backpack m_EditorClassIdentifier: - nameString: Backpack prefab: {fileID: 802333698458937824, guid: ddaa28fac1956b2428aff1dac1d89707, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9435365903a79d64184af9ee71e060e5, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/GasMask.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/GasMask.asset index 71c1e9fa7c..f1c16cd3a5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/GasMask.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/GasMask.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: GasMask m_EditorClassIdentifier: - nameString: GasMask prefab: {fileID: 1687938131941834081, guid: bf177f8bab26bc84b87fd9a971004418, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4a50e327a934cd3438e1b88d2bb547cb, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/GloveInsulated.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/GloveInsulated.asset index 532f61c79c..bee78fabca 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/GloveInsulated.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/GloveInsulated.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: GloveInsulated m_EditorClassIdentifier: prefab: {fileID: 4581819739591165899, guid: 65679cf5a30d6dd458666804af7c3ca3, type: 3} + PrefabAsset: {fileID: 11400000, guid: 55deb25596d5d314b8b7dd58eafb8aec, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Headset.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Headset.asset index 9915bca51c..b40cc3de1c 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Headset.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Headset.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Headset m_EditorClassIdentifier: prefab: {fileID: 8712940276313799639, guid: db15899bc1eb2794fb2b24129852a209, type: 3} + PrefabAsset: {fileID: 11400000, guid: f2914f9670967764e93aa1b262968344, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/HeadsetSecurity.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/HeadsetSecurity.asset index 4e4f2de821..e809d1f3ee 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/HeadsetSecurity.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/HeadsetSecurity.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: HeadsetSecurity m_EditorClassIdentifier: prefab: {fileID: 5049739216948387840, guid: a38ee818c953a404787757d8d20d2851, type: 3} + PrefabAsset: {fileID: 11400000, guid: 5e0824505970aa040a1780b6e80e4630, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitBotany.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitBotany.asset index 0b5a7d045c..1ca47e9b31 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitBotany.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitBotany.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: JumpsuitBotany m_EditorClassIdentifier: prefab: {fileID: 8312388220934557560, guid: be3fcf1a74268ad49bfedb1edd9f5318, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6a9a8af0ce91a634ab42f12ebc7b24a6, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitEngineer.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitEngineer.asset index 54fc992d0d..1da0000a06 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitEngineer.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitEngineer.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: JumpsuitEngineer m_EditorClassIdentifier: prefab: {fileID: 4245634344425516727, guid: 7436f4976849b994aaee40df1bca7d89, type: 3} + PrefabAsset: {fileID: 11400000, guid: c3e196c40ac645e4d840edb82a27baf9, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitGrey.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitGrey.asset index 53d2daaf8e..55ada87c70 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitGrey.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitGrey.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: JumpsuitGrey m_EditorClassIdentifier: prefab: {fileID: 624365323667193292, guid: 236b51ddc6f9aa94ca92579082370c06, type: 3} + PrefabAsset: {fileID: 11400000, guid: 620dc53a5608be44a975c990e69ddba5, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitSecurity.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitSecurity.asset index bc035edbba..e60c744606 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitSecurity.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitSecurity.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: JumpsuitSecurity m_EditorClassIdentifier: prefab: {fileID: 6330158209413936013, guid: 93ad90421a3b2f64e8fdb9e95a42ba90, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9abef62d6f4edd443b3fa81a32f9a5ba, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeHiTop.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeHiTop.asset index 947a09f0ac..e0bc387155 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeHiTop.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeHiTop.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: ShoeHiTop m_EditorClassIdentifier: prefab: {fileID: 930591319891399865, guid: 81faf4debf00a0a478b924176f48d011, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7877ae994c8a31244bf59b1b971caaa5, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeJackboots.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeJackboots.asset index b98e2af2d7..40448d4ab5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeJackboots.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeJackboots.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: ShoeJackboots m_EditorClassIdentifier: prefab: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7514f2bc5fd84a14095929761da0a4dd, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Sunglasses.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Sunglasses.asset index b549afec95..089a1c1fa5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Sunglasses.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Sunglasses.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Sunglasses m_EditorClassIdentifier: - nameString: Sunglasses prefab: {fileID: 2667451333340596270, guid: 9b9f6bd470226a74b903e74dbe9e423a, type: 3} + PrefabAsset: {fileID: 11400000, guid: c0a5c4fc200a5ae4693d9b02fee23b49, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ToolBelt.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ToolBelt.asset index 0b3ec08ad6..68fa11481d 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ToolBelt.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ToolBelt.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: ToolBelt m_EditorClassIdentifier: - nameString: ToolBelt prefab: {fileID: 1080889307602868191, guid: 40d904629802fc942860ce878e78efef, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9cf2801a7b335074190840fc9112d582, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/TruckerCap.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/TruckerCap.asset index 72d11b9248..6efb3bec1d 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/TruckerCap.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/TruckerCap.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: TruckerCap m_EditorClassIdentifier: - nameString: TruckerCap prefab: {fileID: 2601952054522247362, guid: 1ef3c21a685ec2d4e9f0876719839d5f, type: 3} + PrefabAsset: {fileID: 11400000, guid: e53ebba96eeba474e8478131c8d24085, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BrutePatch.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BrutePatch.asset index 394d55ab40..cbea2d9e44 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BrutePatch.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BrutePatch.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: BrutePatch m_EditorClassIdentifier: prefab: {fileID: 4068007204767187790, guid: b5be0a52925e2674193d081d2deb68cb, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8ec2a780fae01344a9431a9cb06d8a7c, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BurnPatch.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BurnPatch.asset index 2d6652e8f4..b8644fba3c 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BurnPatch.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BurnPatch.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: BurnPatch m_EditorClassIdentifier: prefab: {fileID: 4068007204767187790, guid: 162e188d33a82b440a239f20901c716a, type: 3} + PrefabAsset: {fileID: 11400000, guid: e28b644ad26ceae45acf3ceb84b8cbff, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/MedicalPatch.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/MedicalPatch.asset index 5fe7bc4798..de4d9eecbc 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/MedicalPatch.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/MedicalPatch.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: MedicalPatch m_EditorClassIdentifier: prefab: {fileID: 4068007204767187790, guid: 2332a158259900e4f8a237fa8daff266, type: 3} + PrefabAsset: {fileID: 11400000, guid: 1a9f9df755637c3478bf4649e7ab04fd, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepsSoda.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepsSoda.asset index 1e6ad76d94..76cd701e55 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepsSoda.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepsSoda.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanBeepsSoda m_EditorClassIdentifier: - nameString: soda_beepsoda prefab: {fileID: 4482577744063562115, guid: f490a74616c067c4f83995017e10b420, type: 3} + PrefabAsset: {fileID: 11400000, guid: bffc6c08d28041549ae1af640b76ce92, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepyLime.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepyLime.asset index 6d46f0956a..6e4ebcaf1c 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepyLime.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepyLime.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanBeepyLime m_EditorClassIdentifier: - nameString: soda_beepylime prefab: {fileID: 6405503896595845848, guid: 4e6899916bc8fd742a07f32b3a04de12, type: 3} + PrefabAsset: {fileID: 11400000, guid: e41bbba3e5f86d342a514665e8eeba56, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedAir.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedAir.asset index e078c081e5..4750a8bb66 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedAir.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedAir.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanCannedAir m_EditorClassIdentifier: - nameString: soda_cannedair prefab: {fileID: 5774385816057912484, guid: e4281cb43d1443d4388737777fdd98d8, type: 3} + PrefabAsset: {fileID: 11400000, guid: d5ed3684908f1d846815d39a4ae98418, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedLaughter.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedLaughter.asset index f1c4d03711..e21dba5731 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedLaughter.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedLaughter.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanCannedLaughter m_EditorClassIdentifier: - nameString: soda_cannedlaughter prefab: {fileID: 8047892061280000217, guid: dceb056e41b5c634f9933423de8e075c, type: 3} + PrefabAsset: {fileID: 11400000, guid: e6c8ce8c1b83a004389647756897a0c0, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCola.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCola.asset index b99d3d41a2..943c51a773 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCola.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCola.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanCola m_EditorClassIdentifier: - nameString: soda_cola prefab: {fileID: 3995435954105705608, guid: 92d6696a323ef66448190e8e9d69fd22, type: 3} + PrefabAsset: {fileID: 11400000, guid: 1c4488c42b15c364b91b3ebc97c3a840, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanDukePurpleTea.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanDukePurpleTea.asset index 1f0fdf1818..b5b2e2c72e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanDukePurpleTea.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanDukePurpleTea.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanDukePurpleTea m_EditorClassIdentifier: - nameString: soda_dukepurpletea prefab: {fileID: 169984495843080388, guid: 177428b73bad0fb4a89d1a64b85629bf, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9275ab75afcd2ea40b8d00845d500d6a, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanTonic.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanTonic.asset index 1df59eaa2a..197e1f4b8b 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanTonic.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanTonic.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanTonic m_EditorClassIdentifier: - nameString: soda_tonic prefab: {fileID: 2434868383632068905, guid: a7c35693adae32f43b4d7fe2eb8b091b, type: 3} + PrefabAsset: {fileID: 11400000, guid: 532f39f1310fc5d41b37195bc4d0ae11, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/General/Snacks/DonkPocket.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/General/Snacks/DonkPocket.asset index ca3fb0e147..d0ce5474ef 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/General/Snacks/DonkPocket.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/General/Snacks/DonkPocket.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: DonkPocket m_EditorClassIdentifier: prefab: {fileID: 3969530706517246485, guid: 56b1aff2041026242bed0f064dee56bb, type: 3} + PrefabAsset: {fileID: 11400000, guid: 5ebf0777f77019c469729ac80e12720b, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Cosmetic/BikeHorn.asset b/Assets/Content/Data/TileMap/Resources/Items/Cosmetic/BikeHorn.asset index b881c03c78..162ca9ae2a 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Cosmetic/BikeHorn.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Cosmetic/BikeHorn.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: BikeHorn m_EditorClassIdentifier: - nameString: bikehorn prefab: {fileID: 6891363543938182813, guid: 11f824c472e04854e95065dda095e8f4, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3747dddbc41cad94bbbfc43bfed384c3, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Doodad.asset b/Assets/Content/Data/TileMap/Resources/Items/Doodad.asset index 6f51194f70..35699274e3 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Doodad.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Doodad.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Doodad m_EditorClassIdentifier: - nameString: Doodad prefab: {fileID: 3792017003477948967, guid: f6528d8afa18fa14998a0158260ef26c, type: 3} + PrefabAsset: {fileID: 11400000, guid: 27ff1c5556f9d4c40b179cfecee706ea, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Boombox.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Boombox.asset index e96f5f6f86..6b4f0a97c5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Boombox.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Boombox.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Boombox m_EditorClassIdentifier: prefab: {fileID: 8197868818743549203, guid: 1d2cf546d53e3fe4c9103007427aaec7, type: 3} + PrefabAsset: {fileID: 11400000, guid: d81d46f903aad014aa4728a8b47ab7ea, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/FloorTile.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/FloorTile.asset index 821c6ed789..bb10aa60a8 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/FloorTile.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/FloorTile.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: FloorTile m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 404443f7c306fc8469698745624fa3bf, type: 3} + PrefabAsset: {fileID: 11400000, guid: 943460668ce3db0429d1617490f983ef, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/IDCard.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/IDCard.asset index 721109e1f2..c8728eafea 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/IDCard.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/IDCard.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: IDCard m_EditorClassIdentifier: - nameString: idcard prefab: {fileID: 5261116577612792016, guid: d8b0c8d1ddcdeb24d9763054c103c9fe, type: 3} + PrefabAsset: {fileID: 11400000, guid: d4a76ab7d8dbea34cb528fc2b784fd70, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/PDA.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/PDA.asset index de40eeed5c..1add5ff498 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/PDA.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/PDA.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: PDA m_EditorClassIdentifier: - nameString: pda prefab: {fileID: 5261116577612792016, guid: 79260483ae5d3e04fa272e092b49abac, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4773cbe0a88c809459547e0d0eff8d29, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityIDCard.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityIDCard.asset index 2e49bfefd5..1714aeefd8 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityIDCard.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityIDCard.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SecurityIDCard m_EditorClassIdentifier: - nameString: security_idcard prefab: {fileID: 5261116577612792016, guid: ff95abc9c2b779340a1b50f1a128a934, type: 3} + PrefabAsset: {fileID: 11400000, guid: bca8d36802b3dbc47bc479151a3f7ea1, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityPDA.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityPDA.asset index 75c2c4cb5c..71151d3d92 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityPDA.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityPDA.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SecurityPDA m_EditorClassIdentifier: - nameString: security_pda prefab: {fileID: 5261116577612792016, guid: 2a63163a4db141744a802f3ff67087db, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4f09dc7f882c18542b750da80a29720f, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Poster.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Poster.asset index 89d80d95c9..45397c4a7e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Poster.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Poster.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Poster m_EditorClassIdentifier: - nameString: poster prefab: {fileID: 5161561551087789900, guid: b044d7bdb55405046a9055726a779eb1, type: 3} + PrefabAsset: {fileID: 11400000, guid: cd3268046db629240800ee48b64a9810, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/OxygenTank.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/OxygenTank.asset index a0c015fb97..0c2e2e4352 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/OxygenTank.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/OxygenTank.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: OxygenTank m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 5479411218b869144b7d09d6db6dc58e, type: 3} + PrefabAsset: {fileID: 11400000, guid: b42f227c43baa2141938339b7dda3f71, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/PlasmaTank.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/PlasmaTank.asset index 16a6c4fbaf..239a6dc390 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/PlasmaTank.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/PlasmaTank.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: PlasmaTank m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: e3fb39f0a84acf541b6ee828550a1708, type: 3} + PrefabAsset: {fileID: 11400000, guid: a34baef34dca37c449a6f5872216edfc, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalCable.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalCable.asset index 3596868ae9..c0a55c94df 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalCable.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalCable.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: ElectricalCable m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 0e69918696f58e04f846e985ec7405fe, type: 3} + PrefabAsset: {fileID: 11400000, guid: 40f2a5ef12396ce469ae6fa7474a6bc6, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalWire.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalWire.asset index f91415993f..063b5be1e5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalWire.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalWire.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: ElectricalWire m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: cc71128d4bcc0c548ac11481000ac424, type: 3} + PrefabAsset: {fileID: 11400000, guid: 61cd16bb4793cd544836dea40a2450f8, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassReinforcedSheet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassReinforcedSheet.asset index f661730d02..e836fa9222 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassReinforcedSheet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassReinforcedSheet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: GlassReinforcedSheet m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: a1a7407e08bb2914c97f431063bf83e2, type: 3} + PrefabAsset: {fileID: 11400000, guid: 761f8c0e668a1d94ca1e59a4d7561a75, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassShard.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassShard.asset index 400061e5c3..7ab45be943 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassShard.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassShard.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: GlassShard m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 5cab1a9f6c7f74948b84d0d625319efe, type: 3} + PrefabAsset: {fileID: 11400000, guid: e8b9b8395d0c7624aa218df1abb9e29d, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassSheet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassSheet.asset index 764bd89fc6..de997580c0 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassSheet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassSheet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: GlassSheet m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: e2a06f02e6a7e0348bdc535344bfe1f3, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3c8e8f4d958f81744a729dc344342955, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelReinforcedSheet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelReinforcedSheet.asset index 058d159580..9f4b78607e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelReinforcedSheet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelReinforcedSheet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: SteelReinforcedSheet m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: f88a398ad3d01454f955de9c337d9b99, type: 3} + PrefabAsset: {fileID: 11400000, guid: 05cd3679ee853174fb8651304e81f0cd, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelRod.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelRod.asset index 783e8573f9..e0324a6116 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelRod.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelRod.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: SteelRod m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 48fa93e2da7acb3499e400becf2afc26, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3f647cba5228eee4c96dcb4d68c089af, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelSheet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelSheet.asset index 3be57ebb41..e4a122236d 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelSheet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelSheet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: SteelSheet m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 4cb99cf2fee96f944abbacc51b0b701c, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8cfc0ba9b0715224ca017ad6ddfbd66b, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodLog.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodLog.asset index 87ed92d899..4545f65ca6 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodLog.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodLog.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: WoodLog m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 2767aeb6e6fd53b43a1cb305789834d4, type: 3} + PrefabAsset: {fileID: 11400000, guid: e6c3ae3d10a33e240832b7bc90d7b11c, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodPlank.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodPlank.asset index 09906ddab0..0540fd17a5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodPlank.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodPlank.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: WoodPlank m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 4aee3fb97a6a2d442804c8c0b8347a92, type: 3} + PrefabAsset: {fileID: 11400000, guid: 76027f7163b6f874f8e6d0cb5ae45b29, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MatterBin.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MatterBin.asset index b780181835..4109512bf2 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MatterBin.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MatterBin.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: MatterBin m_EditorClassIdentifier: prefab: {fileID: 2402587210622244651, guid: ed77d98d3e75b7946b404face1fe8f82, type: 3} + PrefabAsset: {fileID: 11400000, guid: d09858427deec014fb0abe5ea0b79bdd, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MicroLaser.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MicroLaser.asset index 9e945c78e3..32efae4738 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MicroLaser.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MicroLaser.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: MicroLaser m_EditorClassIdentifier: prefab: {fileID: 2402587210622244651, guid: 84cec183559b4954c883b11f20f767c9, type: 3} + PrefabAsset: {fileID: 11400000, guid: 57ac37b5fd825134a8d8d08b9d87ba70, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCell.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCell.asset index 30dceb9378..0865087e55 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCell.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCell.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: PowerCell m_EditorClassIdentifier: - nameString: PowerCell prefab: {fileID: 2402587210622244651, guid: de67200a4c96d444f800399a033ddfef, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4d84c9a7bcbaa564d8958c6875c8c02d, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCellAdmin.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCellAdmin.asset index 1403ef387b..112bacbdfe 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCellAdmin.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCellAdmin.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: PowerCellAdmin m_EditorClassIdentifier: - nameString: PowerCellAdmin prefab: {fileID: 7927487060350510867, guid: c69ed93dc225ea049bbf1a02662c48c0, type: 3} + PrefabAsset: {fileID: 11400000, guid: 19be5347e4fe0e346b5f3a3a9b3081fa, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/Medkit.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/Medkit.asset index 31ba524b28..108e861888 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/Medkit.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/Medkit.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Medkit m_EditorClassIdentifier: prefab: {fileID: 5533951594911835035, guid: 1e64a1c37be1f7c44a5d242d6ec6da10, type: 3} + PrefabAsset: {fileID: 11400000, guid: d9cc887ee78f4f64f9c399b8aaffe9f9, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/ToolboxBlue.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/ToolboxBlue.asset index 2d1eec4ab0..0d21a2a29b 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/ToolboxBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/ToolboxBlue.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: ToolboxBlue m_EditorClassIdentifier: - nameString: toolbox_blue prefab: {fileID: 5533951594911835035, guid: 264ea51d92067c14ebc6633999afac78, type: 3} + PrefabAsset: {fileID: 11400000, guid: 734468cf273e2144d945698e4793b7c5, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Substances/Mug.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Substances/Mug.asset index 32f96f5760..ac50b41ae7 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Substances/Mug.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Substances/Mug.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Mug m_EditorClassIdentifier: - nameString: mug prefab: {fileID: 5261116577612792016, guid: d9aabfd5d726a7f499b8e360d919eba4, type: 3} + PrefabAsset: {fileID: 11400000, guid: 162ccd1fc7d534046874df3d9dcf2315, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Botany/Hatchet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Botany/Hatchet.asset index a51cbc9001..d261d3b757 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Botany/Hatchet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Botany/Hatchet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Hatchet m_EditorClassIdentifier: prefab: {fileID: 2402587210622244651, guid: 9e967cb4084bf064c8a0ca5f57a33b0c, type: 3} + PrefabAsset: {fileID: 11400000, guid: 2577eda4621dd6248b3c3813ef15ad76, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Command/NuclearAuthenticationDisk.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Command/NuclearAuthenticationDisk.asset index 7e2090636d..11493b58d4 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Command/NuclearAuthenticationDisk.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Command/NuclearAuthenticationDisk.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: NuclearAuthenticationDisk m_EditorClassIdentifier: - nameString: nuke_disk prefab: {fileID: 6891363543938182813, guid: 1ae18785d74e9fa4699b6f6de889c243, type: 3} + PrefabAsset: {fileID: 11400000, guid: 50284e9bdc2ff2943ba806e8d5ce8f9f, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Crowbar.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Crowbar.asset index 14e6b6276c..af78e65053 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Crowbar.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Crowbar.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Crowbar m_EditorClassIdentifier: - nameString: Crowbar prefab: {fileID: 1888703706215615217, guid: 7becfab153276864f9fc7636a839d837, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9310ba3e563558e42bdbd19ee6b8440c, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Multitool.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Multitool.asset index ab309aa0c7..9bbc727787 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Multitool.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Multitool.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Multitool m_EditorClassIdentifier: - nameString: Multitool prefab: {fileID: 2402587210622244651, guid: 2ca5f2886cf2f19428b50bf284689b86, type: 3} + PrefabAsset: {fileID: 11400000, guid: bd14f7dd0646a2240adf09ba61ce700a, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/ScrewdriverBlue.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/ScrewdriverBlue.asset index 4d33c208a4..419997fc10 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/ScrewdriverBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/ScrewdriverBlue.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: ScrewdriverBlue m_EditorClassIdentifier: - nameString: ScrewdriverBlue prefab: {fileID: 2402587210622244651, guid: 9c8363ee7f934bd4b8ee5a2e30da1269, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9e4b9aa465bc48d4faa9b53cd0132f11, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Welder.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Welder.asset index da8fa6b081..b65b3b788c 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Welder.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Welder.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Welder m_EditorClassIdentifier: prefab: {fileID: 7393721560307922778, guid: 06d944205e6b6dd489af078fa85fb878, type: 3} + PrefabAsset: {fileID: 11400000, guid: 715777b8c0a0f1b4cb29ee4dab0326e4, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wirecutters.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wirecutters.asset index 5bbbbd7adc..3a487e2c2e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wirecutters.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wirecutters.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Wirecutters m_EditorClassIdentifier: - nameString: Wirecutters prefab: {fileID: 2402587210622244651, guid: 41a1c8c211dc32c4d8ffca5f0892f9dc, type: 3} + PrefabAsset: {fileID: 11400000, guid: f784858d359bb434c9a7ea797c27552d, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wrench.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wrench.asset index 261b152d99..b1cbc4e0dc 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wrench.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wrench.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Wrench m_EditorClassIdentifier: - nameString: Wrench prefab: {fileID: 3792017003477948967, guid: 772da386eb7b01745913050fee544c32, type: 3} + PrefabAsset: {fileID: 11400000, guid: fd8e3cf550cdc704281d3b94b5c8d631, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Generic/FlashlightBlue.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Generic/FlashlightBlue.asset index 07e52ea613..2088ee3ac2 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Generic/FlashlightBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Generic/FlashlightBlue.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: FlashlightBlue m_EditorClassIdentifier: - nameString: FlashlightBlue prefab: {fileID: 833752496874958856, guid: 781dd9024aaa53444bc3deeaa9708fbb, type: 3} + PrefabAsset: {fileID: 11400000, guid: cb8a18ff6b582ec45a3aa1f689a18564, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Kitchen/KitchenKnife.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Kitchen/KitchenKnife.asset index 2964f3940f..982038cc60 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Kitchen/KitchenKnife.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Kitchen/KitchenKnife.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: KitchenKnife m_EditorClassIdentifier: - nameString: Kitchen knife prefab: {fileID: 3794527162878356835, guid: 411b513efc8f06a40aecfc47d0c5fc5a, type: 3} + PrefabAsset: {fileID: 11400000, guid: f5a2860feace1434ea982b06d2445f9f, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Medical/HealthScanner.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Medical/HealthScanner.asset index 351f14cf6f..ebc92ab47e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Medical/HealthScanner.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Medical/HealthScanner.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: HealthScanner m_EditorClassIdentifier: prefab: {fileID: 3794527162878356835, guid: e9f99df80a74fd242aa46e53c7ec0376, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8b24dd8aaf23acb41b038d6e4394f749, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockCivilian.asset b/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockCivilian.asset index e0ecc44f70..60fbf96227 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockCivilian.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockCivilian.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AirlockCivilian m_EditorClassIdentifier: - nameString: airlock_civilian prefab: {fileID: 7133738675197207439, guid: 84a5596b28f449e49bb34741abf89d30, type: 3} + PrefabAsset: {fileID: 11400000, guid: a9fdd63bb75b809479346bf8a5304420, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 13 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockSecurity.asset b/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockSecurity.asset index d22fa049ef..3d59c57076 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockSecurity.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockSecurity.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AirlockSecurity m_EditorClassIdentifier: - nameString: airlock_security prefab: {fileID: 7133738675197207439, guid: d25b39d1e2379b64cba47629530ada78, type: 3} + PrefabAsset: {fileID: 11400000, guid: a88eb8e09990e854d81539973299f61f, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 13 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Catwalk.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Catwalk.asset index b6d9b90337..3762914430 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Catwalk.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Catwalk.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Catwalk m_EditorClassIdentifier: - nameString: catwalk prefab: {fileID: 8178185248287418974, guid: a28267798293970468ab30803632a3f7, type: 3} + PrefabAsset: {fileID: 11400000, guid: b4f1b51f78d516547a665fcbfcc9a7c9, type: 2} icon: {fileID: 0} + _nameString: layer: 0 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Lattice.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Lattice.asset index 8c8af48dea..227458ac1d 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Lattice.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Lattice.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Lattice m_EditorClassIdentifier: - nameString: lattice prefab: {fileID: 7825286949101219487, guid: 854451834f026fb4f860bf0e977a104c, type: 3} + PrefabAsset: {fileID: 11400000, guid: b692a03693f271f42a9207742b0d900a, type: 2} icon: {fileID: 0} + _nameString: layer: 0 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Plenum.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Plenum.asset index afa0b07a24..2131363397 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Plenum.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Plenum.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Plenum m_EditorClassIdentifier: - nameString: plenum prefab: {fileID: 8028539322119499722, guid: 3b33b5cf16a677a4e85a110679cde32a, type: 3} + PrefabAsset: {fileID: 11400000, guid: b0c72ccf49a812947b0b526481ec6b7a, type: 2} icon: {fileID: 0} + _nameString: layer: 0 genericType: 8 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBlue.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBlue.asset index 065022d19d..abd611e1d2 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBlue.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerBlue m_EditorClassIdentifier: - nameString: overlay_blue prefab: {fileID: 6767447678079105841, guid: 821d0946be816bb42a0eed24631d57ee, type: 3} + PrefabAsset: {fileID: 11400000, guid: 65c0502418577df42af3550984f4d3e4, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBrown.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBrown.asset index bdb86cef2b..6ae4144550 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBrown.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBrown.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerBrown m_EditorClassIdentifier: - nameString: overlay_brown prefab: {fileID: 6767447678079105841, guid: 3a7b793253e1a0f4587097192998c361, type: 3} + PrefabAsset: {fileID: 11400000, guid: abb8c67566bdcf9438e555572a418bcc, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerGreen.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerGreen.asset index faa843c550..641feb400d 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerGreen.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerGreen.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerGreen m_EditorClassIdentifier: - nameString: overlay_green prefab: {fileID: 6767447678079105841, guid: b3e652487789fe54d8d24245d5962c3a, type: 3} + PrefabAsset: {fileID: 11400000, guid: d14164a0dea844d4b87267ce6b740365, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerOrange.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerOrange.asset index 942e65df22..cedda91d49 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerOrange.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerOrange.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerOrange m_EditorClassIdentifier: - nameString: overlay_orange prefab: {fileID: 6767447678079105841, guid: 6cd51fc127b8aac40b2accd3e2666202, type: 3} + PrefabAsset: {fileID: 11400000, guid: 5ca13124364b49a4e8812b39fcdf9c03, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerPurple.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerPurple.asset index 5bb7e9b802..115c993964 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerPurple.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerPurple.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerPurple m_EditorClassIdentifier: - nameString: overlay_purple prefab: {fileID: 6767447678079105841, guid: 14df766b77b0daf4b82ad93125f66782, type: 3} + PrefabAsset: {fileID: 11400000, guid: b58ca8ffc283af542b756a32df865f58, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerRed.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerRed.asset index afec2823f6..24acc083d3 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerRed.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerRed.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerRed m_EditorClassIdentifier: - nameString: overlay_red prefab: {fileID: 6767447678079105841, guid: 5e24183c4537dcf47b16fde5ab1ce0ea, type: 3} + PrefabAsset: {fileID: 11400000, guid: 51754ff4045cce948a7d03d37ac3ed54, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TIleGrey.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TIleGrey.asset index f76ff14650..bfff875d89 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TIleGrey.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TIleGrey.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TIleGrey m_EditorClassIdentifier: - nameString: tile_grey prefab: {fileID: 6767447678079105841, guid: 7a47e5b68d8bab647b3f99ee3af524c7, type: 3} + PrefabAsset: {fileID: 11400000, guid: dbff915a0c8dd9442b22781f2358017c, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileBar.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileBar.asset index 5da322c0d6..cb7a9de8c7 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileBar.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileBar.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileBar m_EditorClassIdentifier: - nameString: tile_bar prefab: {fileID: 6767447678079105841, guid: 75680e6a1df5ff547bdb5b8f116f766b, type: 3} + PrefabAsset: {fileID: 11400000, guid: e6e23e6ec76da7c4eaf5f33cbc356f8e, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileCarpet.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileCarpet.asset index 670c436616..ba6d31d54b 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileCarpet.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileCarpet.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileCarpet m_EditorClassIdentifier: - nameString: tile_carpet - layer: 1 prefab: {fileID: 3591147544166670882, guid: 9b8a1328991fc2846bc55a3d9a82e5c0, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6f588fdc347034040af927379a043428, type: 2} icon: {fileID: 0} + _nameString: + layer: 1 genericType: 9 specificType: 5 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileDirt.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileDirt.asset index abcc9ed589..ff0170849a 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileDirt.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileDirt.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileDirt m_EditorClassIdentifier: - nameString: tile_dirt prefab: {fileID: 6767447678079105841, guid: 0ef9cea3bb74e6c4788f77e711f92d4d, type: 3} + PrefabAsset: {fileID: 11400000, guid: 41904bd2be19b8d4f9b54bcb4c35e4b1, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGrass.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGrass.asset index acb79ed405..4c3006c61e 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGrass.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGrass.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileGrass m_EditorClassIdentifier: - nameString: tile_grass prefab: {fileID: 6767447678079105841, guid: 501391c27a7f94c4d8c937f00a9ceb9f, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6b7b691c97678ca44b6e350dac1fe15f, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGreyDark.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGreyDark.asset index 033f3718b9..69cb82bf74 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGreyDark.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGreyDark.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileGreyDark m_EditorClassIdentifier: - nameString: tile_greydark prefab: {fileID: 5554428447677395221, guid: 6873d7cf62d6ebc42966423161b799f1, type: 3} + PrefabAsset: {fileID: 11400000, guid: cf2d801ddd077fc42824b5fbfb3f4dec, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileKitchen.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileKitchen.asset index 1885a1cd75..607f2af805 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileKitchen.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileKitchen.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileKitchen m_EditorClassIdentifier: - nameString: tile_kitchen prefab: {fileID: 6767447678079105841, guid: 5ecf13819099b014eb5f731155540586, type: 3} + PrefabAsset: {fileID: 11400000, guid: 13636a93db27869488e3530c24cb465e, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TilePlating.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TilePlating.asset index ccb098c65a..2dd79e0f16 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TilePlating.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TilePlating.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TilePlating m_EditorClassIdentifier: - nameString: tile_plating prefab: {fileID: 6767447678079105841, guid: 8686fbdb413e33b4395a775c4f2ba990, type: 3} + PrefabAsset: {fileID: 11400000, guid: 663cae2ee60f36940a4e26dc0b3bf960, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileReinforced.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileReinforced.asset index a5026a849d..2c842c80d1 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileReinforced.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileReinforced.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileReinforced m_EditorClassIdentifier: - nameString: tile_reinforced prefab: {fileID: 8597721773267636030, guid: df4cf328d472de046bcbc073cbda2868, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4ab72d74a57157a4fba259b6707a1234, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWhite.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWhite.asset index 9bb9e42358..b195bdd989 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWhite.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWhite.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileWhite m_EditorClassIdentifier: - nameString: tile_white prefab: {fileID: 6767447678079105841, guid: 61201f10ccc2856459a9de99d9cdc52e, type: 3} + PrefabAsset: {fileID: 11400000, guid: e5a9093f9ed950049869333d55ef39ea, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWood.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWood.asset index 0ed60aadc2..dc26c81afe 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWood.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWood.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileWood m_EditorClassIdentifier: - nameString: tile_wood prefab: {fileID: 6767447678079105841, guid: 49f2097d4710d114a89821d9164dfce2, type: 3} + PrefabAsset: {fileID: 11400000, guid: da803d5b339bf404eadd61c6f3b84474, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL1.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL1.asset index 09e2a329d7..ec161a3679 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL1.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL1.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AtmosphericsPipesL1 m_EditorClassIdentifier: - nameString: pipe_atmos1 prefab: {fileID: 2802364579275783218, guid: de6f06ad18d50134295959f438ba9c5d, type: 3} + PrefabAsset: {fileID: 11400000, guid: 34c154e54c7326c44aef8c0d179cec5b, type: 2} icon: {fileID: 0} + _nameString: layer: 11 genericType: 1 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL2.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL2.asset index 75925e4e26..2eecb38180 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL2.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL2.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AtmosphericsPipesL2 m_EditorClassIdentifier: - nameString: pipe_atmos2 prefab: {fileID: 2802364579275783218, guid: 251dc2a5fbda518429c8205c3b62165f, type: 3} + PrefabAsset: {fileID: 11400000, guid: 654481f628e6c374da829aa5f008d7dd, type: 2} icon: {fileID: 0} + _nameString: layer: 10 genericType: 1 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL3.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL3.asset index 023a91a060..56d3316b47 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL3.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL3.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AtmosphericsPipesL3 m_EditorClassIdentifier: - nameString: pipe_atmos3 prefab: {fileID: 2802364579275783218, guid: adc07a7f0fee8304691f45a201509b13, type: 3} + PrefabAsset: {fileID: 11400000, guid: 0ad56fda1bd23c84e87f2ffa176cfe45, type: 2} icon: {fileID: 0} + _nameString: layer: 12 genericType: 1 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL4.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL4.asset index 1fac33e096..e800bc0e39 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL4.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL4.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AtmosphericsPipesL4 m_EditorClassIdentifier: - nameString: pipe_atmos4 prefab: {fileID: 2802364579275783218, guid: 48efd00c91c310e4bb965d025c63b3ba, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8bb00252a30a34b42a51ef42c87b2427, type: 2} icon: {fileID: 0} + _nameString: layer: 4 genericType: 1 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Disposals/DisposalPipes.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Disposals/DisposalPipes.asset index 9cc04e3bf4..50534bfda6 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Disposals/DisposalPipes.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Disposals/DisposalPipes.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: DisposalPipes m_EditorClassIdentifier: - nameString: pipe_disposal prefab: {fileID: 2802364579275783218, guid: 12a989ad41a83a3468d1ae9aff9628d3, type: 3} + PrefabAsset: {fileID: 11400000, guid: 57608ddf01d6f6049a7130f791e07297, type: 2} icon: {fileID: 0} + _nameString: layer: 3 genericType: 14 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/APC.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/APC.asset index 0d0740c51c..1f57fb649d 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/APC.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/APC.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: APC m_EditorClassIdentifier: prefab: {fileID: 5287103069661579500, guid: 4c966398d6624164c910cd29c1faa980, type: 3} + PrefabAsset: {fileID: 11400000, guid: cd7e56a30be55964da66a4dc51f532d1, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/AirAlarm.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/AirAlarm.asset index fe5058a940..35654fb72e 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/AirAlarm.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/AirAlarm.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: AirAlarm m_EditorClassIdentifier: prefab: {fileID: 6961426338783081091, guid: 11a2276338ebc64429dfc565b491e437, type: 3} + PrefabAsset: {fileID: 11400000, guid: 553dd4a427540f54dba418ab2a639b82, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/FireAlarm.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/FireAlarm.asset index 9051037301..65187660ca 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/FireAlarm.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/FireAlarm.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: FireAlarm m_EditorClassIdentifier: prefab: {fileID: 4866668043303595546, guid: 50dd6be959d44844ab1abf8a3f2adb01, type: 3} + PrefabAsset: {fileID: 11400000, guid: 82ff9c63ee13a144cad79942dbb6b9b6, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/LightSwitch.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/LightSwitch.asset index 5ee5ba1a2a..91adb9b21b 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/LightSwitch.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/LightSwitch.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: LightSwitch m_EditorClassIdentifier: - nameString: light_switch prefab: {fileID: 4866668043303595546, guid: d07b5fba3896ff448855d6e54356c365, type: 3} + PrefabAsset: {fileID: 11400000, guid: 2bdfc2fea79ba2643bb298047a8f3f67, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: layer: 6 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightBulbFixture.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightBulbFixture.asset index 1069be401f..ba5e620824 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightBulbFixture.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightBulbFixture.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: LightBulbFixture m_EditorClassIdentifier: - nameString: light_bulb_fixture prefab: {fileID: 4866668043303595546, guid: 98ce0a84deb394b4bbd18f31f368317c, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7304ea80fca3e464bbe7a027e805ca03, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: layer: 5 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightTubeFixture.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightTubeFixture.asset index b0a7821341..5df8eaacfd 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightTubeFixture.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightTubeFixture.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: LightTubeFixture m_EditorClassIdentifier: - nameString: light_tube_fixture prefab: {fileID: 4866668043303595546, guid: 66f6206faf2f7fb4a993d935c83fc239, type: 3} + PrefabAsset: {fileID: 11400000, guid: b4e43e35192541a4ca23c3cef6db5e4f, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: layer: 5 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Mirror.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Mirror.asset index 3e5bef2a7a..054aba250b 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Mirror.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Mirror.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: Mirror m_EditorClassIdentifier: prefab: {fileID: 4866668043303595546, guid: a777a6da30f0704478e25312963a8151, type: 3} + PrefabAsset: {fileID: 11400000, guid: 1d63eb8b17aa92e48b1e167577fbfa32, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterHorizontal.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterHorizontal.asset index 412a2ed4af..6c708632c8 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterHorizontal.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterHorizontal.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: PosterHorizontal m_EditorClassIdentifier: prefab: {fileID: 5161561551087789900, guid: fdaaabc96a55d824a86a3636906240c1, type: 3} + PrefabAsset: {fileID: 11400000, guid: 744c2b8be430f5a448ab30c7de840764, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterVertical.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterVertical.asset index 472dda647e..69fed87b2c 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterVertical.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterVertical.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: PosterVertical m_EditorClassIdentifier: prefab: {fileID: 5927714388255546572, guid: 0d6ab6288624c7348bdcbfb81d07088f, type: 3} + PrefabAsset: {fileID: 11400000, guid: ab8a961ad18f29e4da434bd050dc52c9, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirder.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirder.asset index 26186894c0..8d6a4912aa 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirder.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirder.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelGirder m_EditorClassIdentifier: - nameString: girder_steel prefab: {fileID: 3591147544166670882, guid: 6c2559c2017ada740b245951a23c2e1d, type: 3} + PrefabAsset: {fileID: 11400000, guid: bbc616cb55d58144eb50ce126cfca103, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirderUnbolted.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirderUnbolted.asset index ef201c803a..6c6f809bad 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirderUnbolted.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirderUnbolted.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: SteelGirderUnbolted m_EditorClassIdentifier: prefab: {fileID: 3591147544166670882, guid: 5dba4171f2124fb48b0e32c0e10841e0, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6fbb4f54f5632024680a17fba3fdf53d, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWall.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWall.asset index e392f4f0c4..698cf96d69 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWall.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWall.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelWall m_EditorClassIdentifier: - nameString: wall_steel prefab: {fileID: 3591147544166670882, guid: 45d13347efae0f54882e0e56dd770bb1, type: 3} + PrefabAsset: {fileID: 11400000, guid: afd2790edc5c26a48ae1e0f45ecb1f32, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWallReinforced.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWallReinforced.asset index f9e77d959d..b2730275bd 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWallReinforced.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWallReinforced.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelWallReinforced m_EditorClassIdentifier: - nameString: wall_steelreinforced prefab: {fileID: 3591147544166670882, guid: abcc60752234e584d8d98c9dec03e7cc, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9b16536c8b6953b459e5906389bc4cdd, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindow.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindow.asset index b3e8cbc55e..c6f88d0610 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindow.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindow.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelWindow m_EditorClassIdentifier: - nameString: window_steel prefab: {fileID: 3591147544166670882, guid: b9c224febb4233f4e912745553097652, type: 3} + PrefabAsset: {fileID: 11400000, guid: 72ff3e5319a440c448928af8af541920, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindowReinforced.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindowReinforced.asset index 12b84b8b80..3a5cce9bd9 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindowReinforced.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindowReinforced.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelWindowReinforced m_EditorClassIdentifier: - nameString: window_steelreinforced prefab: {fileID: 3591147544166670882, guid: f2493b5478dd8e946ba98861f533362e, type: 3} + PrefabAsset: {fileID: 11400000, guid: b841d8cacfb432a4789bbb387b08fe81, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Wires/Cables.asset b/Assets/Content/Data/TileMap/Resources/Structures/Wires/Cables.asset index 4e9dd0292c..5b87c683a5 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Wires/Cables.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Wires/Cables.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Cables m_EditorClassIdentifier: - nameString: cables prefab: {fileID: 2802364579275783218, guid: 92d3eb280886ba74cb1e19f4e01669a7, type: 3} + PrefabAsset: {fileID: 11400000, guid: 426c07dc64523524f86c9d22e9a98936, type: 2} icon: {fileID: 0} + _nameString: layer: 2 genericType: 11 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/APC.asset b/Assets/Content/Data/WorldObjectAssetReferences/APC.asset new file mode 100644 index 0000000000..b4255df607 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/APC.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: APC + m_EditorClassIdentifier: + Id: 4c966398d6624164c910cd29c1faa980 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta new file mode 100644 index 0000000000..c01a5abc29 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd7e56a30be55964da66a4dc51f532d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset b/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset new file mode 100644 index 0000000000..540fd4265b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AirAlarm + m_EditorClassIdentifier: + Id: 11a2276338ebc64429dfc565b491e437 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta new file mode 100644 index 0000000000..0567b65166 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 553dd4a427540f54dba418ab2a639b82 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset new file mode 100644 index 0000000000..0446bf9fe6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AtmosPipesL1 + m_EditorClassIdentifier: + Id: de6f06ad18d50134295959f438ba9c5d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta new file mode 100644 index 0000000000..0709e3c3d6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34c154e54c7326c44aef8c0d179cec5b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset new file mode 100644 index 0000000000..ea883079df --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AtmosPipesL2 + m_EditorClassIdentifier: + Id: 251dc2a5fbda518429c8205c3b62165f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta new file mode 100644 index 0000000000..80b41c9514 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 654481f628e6c374da829aa5f008d7dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset new file mode 100644 index 0000000000..2f917332e9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AtmosPipesL3 + m_EditorClassIdentifier: + Id: adc07a7f0fee8304691f45a201509b13 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta new file mode 100644 index 0000000000..76ed130e10 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ad56fda1bd23c84e87f2ffa176cfe45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset new file mode 100644 index 0000000000..2784ca0b20 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AtmosPipesL4 + m_EditorClassIdentifier: + Id: 48efd00c91c310e4bb965d025c63b3ba + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta new file mode 100644 index 0000000000..c16b55ca3d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8bb00252a30a34b42a51ef42c87b2427 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset b/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset new file mode 100644 index 0000000000..4cce5492d7 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Blender + m_EditorClassIdentifier: + Id: 5a09b3e93f0022b468da150e3c4a78c6 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta new file mode 100644 index 0000000000..b742054c8e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c106e3753ddf7bf478a44b1b84e29a75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset b/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset new file mode 100644 index 0000000000..b41b120cce --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Cables + m_EditorClassIdentifier: + Id: 92d3eb280886ba74cb1e19f4e01669a7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta new file mode 100644 index 0000000000..2fcd165aae --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 426c07dc64523524f86c9d22e9a98936 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset b/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset new file mode 100644 index 0000000000..f92828da76 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Catwalk + m_EditorClassIdentifier: + Id: a28267798293970468ab30803632a3f7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta new file mode 100644 index 0000000000..873fbda297 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4f1b51f78d516547a665fcbfcc9a7c9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset b/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset new file mode 100644 index 0000000000..1c168c8e0e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: ChemicalDispenser + m_EditorClassIdentifier: + Id: 829e74fee2b909242821055cc2b096e0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta new file mode 100644 index 0000000000..43bf8bb684 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1f5ecddf221c1a47982808266f2070c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset b/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset new file mode 100644 index 0000000000..9d1abc9790 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: CivillianAirlock + m_EditorClassIdentifier: + Id: 84a5596b28f449e49bb34741abf89d30 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta new file mode 100644 index 0000000000..956b633f4f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9fdd63bb75b809479346bf8a5304420 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset b/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset new file mode 100644 index 0000000000..e3487a6d88 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Cryotube + m_EditorClassIdentifier: + Id: 081d9ee3e54295d49a4970a88f4943a9 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta new file mode 100644 index 0000000000..4a9155179b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47922ffa76b90df46b58005fe77de084 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset b/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset new file mode 100644 index 0000000000..02f0dbcefd --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: DinnerBooth + m_EditorClassIdentifier: + Id: 85fa4c9b76b4b23458dcf24a745a1dfe + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta new file mode 100644 index 0000000000..6f88687a93 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4467e57350dc14745b7ef76c60fd8001 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset b/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset new file mode 100644 index 0000000000..1fc91d59c9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: DisposalBin + m_EditorClassIdentifier: + Id: 23a169aefca62c4418b6efec13df595e + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta new file mode 100644 index 0000000000..38ac94dd5d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e13680fe42def4449c8d79dc3318818 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset b/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset new file mode 100644 index 0000000000..d4b38bf4cd --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: DisposalOutlet + m_EditorClassIdentifier: + Id: 7c6bebf2e12702d48abd76acad4d1272 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta new file mode 100644 index 0000000000..a6d3c3b596 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6fa242ef9bd905b4b8ba6b969a50c17e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset b/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset new file mode 100644 index 0000000000..f5ec61baeb --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: DisposalPipes + m_EditorClassIdentifier: + Id: 12a989ad41a83a3468d1ae9aff9628d3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta new file mode 100644 index 0000000000..36e1dc025a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57608ddf01d6f6049a7130f791e07297 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset b/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset new file mode 100644 index 0000000000..a8f298bfe9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: FancyCarpetRed + m_EditorClassIdentifier: + Id: 9b8a1328991fc2846bc55a3d9a82e5c0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta new file mode 100644 index 0000000000..e13e7dd26f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f588fdc347034040af927379a043428 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset b/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset new file mode 100644 index 0000000000..6f5f73851a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: FireAlarm + m_EditorClassIdentifier: + Id: 50dd6be959d44844ab1abf8a3f2adb01 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta new file mode 100644 index 0000000000..4426831a47 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82ff9c63ee13a144cad79942dbb6b9b6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset b/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset new file mode 100644 index 0000000000..ce0134094b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: FuelTank + m_EditorClassIdentifier: + Id: 852d57bdb0508494fb6047f36e813c69 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta new file mode 100644 index 0000000000..1a57713121 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96ca9ccd597fc434d8b4c00f1143ebee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset b/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset new file mode 100644 index 0000000000..09fbaeacf1 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Gibber + m_EditorClassIdentifier: + Id: ad055c3d74a711a4b9d9b31217883a03 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta new file mode 100644 index 0000000000..c00439e223 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b207b8ee084b79b4596fdecc5de5c8dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset b/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset new file mode 100644 index 0000000000..50190ed2d9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: JukeboxBlueGreen + m_EditorClassIdentifier: + Id: 8dc5399c58290d54f9a6cc2f6c1c9d9f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta new file mode 100644 index 0000000000..6ee3627605 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7b11732c4258a14a99087cbbc175eab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset b/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset new file mode 100644 index 0000000000..61dc568ef2 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Lattice + m_EditorClassIdentifier: + Id: 854451834f026fb4f860bf0e977a104c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta new file mode 100644 index 0000000000..146dd7ad7f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b692a03693f271f42a9207742b0d900a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset b/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset new file mode 100644 index 0000000000..0483b8fa12 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: LightBulbFixture + m_EditorClassIdentifier: + Id: 98ce0a84deb394b4bbd18f31f368317c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta new file mode 100644 index 0000000000..c52ef73d8e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7304ea80fca3e464bbe7a027e805ca03 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset b/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset new file mode 100644 index 0000000000..6fdc9dff73 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: LightSwitch + m_EditorClassIdentifier: + Id: d07b5fba3896ff448855d6e54356c365 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta new file mode 100644 index 0000000000..753e60588e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bdfc2fea79ba2643bb298047a8f3f67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset b/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset new file mode 100644 index 0000000000..b297cfd0f6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: LightTubeFixture + m_EditorClassIdentifier: + Id: 66f6206faf2f7fb4a993d935c83fc239 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta new file mode 100644 index 0000000000..d4f3433a02 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4e43e35192541a4ca23c3cef6db5e4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset b/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset new file mode 100644 index 0000000000..78bff4e167 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Locker + m_EditorClassIdentifier: + Id: fa1909e0d40b4cf408ff599df7a2043f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta new file mode 100644 index 0000000000..c61f0a9819 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f994423a5d0fd1e41858be3166101149 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset b/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset new file mode 100644 index 0000000000..227cb7b68d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: LockerSecure + m_EditorClassIdentifier: + Id: 330d85a67a5891145bd8037dde90f37b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta new file mode 100644 index 0000000000..075effbdeb --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3804d158eb924df468d8ebd0c01da9bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset b/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset new file mode 100644 index 0000000000..eb498d63cf --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: MachineFrame + m_EditorClassIdentifier: + Id: bdeac5e9a27546348a584caa74f00ec7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta new file mode 100644 index 0000000000..bf6f7b1d78 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7965545d91b399842b227ff775f06b33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset b/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset new file mode 100644 index 0000000000..c5ec722f35 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Microwave + m_EditorClassIdentifier: + Id: 11d64ed349b96ec4780c4dda0ad89daf + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta new file mode 100644 index 0000000000..4157c88d1f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6dc7a600d222dc644ae89ef4a09f9b8d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset b/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset new file mode 100644 index 0000000000..52c8aa8f72 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Mirror + m_EditorClassIdentifier: + Id: a777a6da30f0704478e25312963a8151 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta new file mode 100644 index 0000000000..7b095b8b1b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d63eb8b17aa92e48b1e167577fbfa32 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset b/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset new file mode 100644 index 0000000000..34a4c860ab --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: NukeCart + m_EditorClassIdentifier: + Id: add4d1bc2d874d94782d6b8c912af5e2 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta new file mode 100644 index 0000000000..35d951a7e3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 429460ce2249f9f438cf31c6ef35b298 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset new file mode 100644 index 0000000000..6984b4bb74 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: OfficeChair + m_EditorClassIdentifier: + Id: 7a895b269e3f67241af148d25331f5af + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta new file mode 100644 index 0000000000..7d58dea1a9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9b535e0cb6122741bab6b987207a626 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset new file mode 100644 index 0000000000..b48838ef6a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: OfficeChairBlue + m_EditorClassIdentifier: + Id: 51049866c35db47418dfe5e78bee76e7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta new file mode 100644 index 0000000000..43bf38a8ac --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb3ca8be4114e4d409b3d69fae2f9428 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset new file mode 100644 index 0000000000..aa5169ab9f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: OfficeChairGrey + m_EditorClassIdentifier: + Id: 7e7706a54d61daa47857aadd94b37002 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta new file mode 100644 index 0000000000..acbc47505d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1ce84881d67528419ccb2f2947dc17c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset b/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset new file mode 100644 index 0000000000..8706cd4b1c --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PacManGenerator + m_EditorClassIdentifier: + Id: 45cc43b84ee58e644b9523cb27682b39 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta new file mode 100644 index 0000000000..3116e91805 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70c5d3dd9aae4924ca510544b02d153f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset b/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset new file mode 100644 index 0000000000..f432f78932 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Plant0 + m_EditorClassIdentifier: + Id: 41d7af24659a0d3439668aeb4c46d9bc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta new file mode 100644 index 0000000000..a997b9d715 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f81f6e487d7acc449f47ee1bb0c8cb7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset b/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset new file mode 100644 index 0000000000..faa98738d8 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Plant7 + m_EditorClassIdentifier: + Id: 8ae2f499d25bfcd41bf26b735c852ab1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta new file mode 100644 index 0000000000..3465f46a8c --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f69d24f5d22e8a4ebc1e60eb6c74d98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset new file mode 100644 index 0000000000..aa56766f2f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PlasticChair + m_EditorClassIdentifier: + Id: 4a1bd08646e8e1f4a861960d9b7485f8 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta new file mode 100644 index 0000000000..8d228dab71 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f62fbce52ff26fc449c2c38c1c759004 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset new file mode 100644 index 0000000000..247756297f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PlasticChairBlue + m_EditorClassIdentifier: + Id: ad124dd2ec7d83344a20a44fad208ca0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta new file mode 100644 index 0000000000..3faffa5ef5 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c0f778498a9baa4ebc43a943c97a314 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset new file mode 100644 index 0000000000..273ecc60b3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PlasticChairGrey + m_EditorClassIdentifier: + Id: 3a25eb0bd251b5847af05fb59feff383 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta new file mode 100644 index 0000000000..df3d81ea93 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c830ff804dedfcb48aded18665c08225 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset b/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset new file mode 100644 index 0000000000..6bdd6ef20f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PosterHorizontal + m_EditorClassIdentifier: + Id: fdaaabc96a55d824a86a3636906240c1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta new file mode 100644 index 0000000000..1cd9240151 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 744c2b8be430f5a448ab30c7de840764 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset b/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset new file mode 100644 index 0000000000..8dd0887561 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PosterVertical + m_EditorClassIdentifier: + Id: 0d6ab6288624c7348bdcbfb81d07088f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta new file mode 100644 index 0000000000..b7e228c3b7 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab8a961ad18f29e4da434bd050dc52c9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset new file mode 100644 index 0000000000..4b726f8427 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PowerCellCharger + m_EditorClassIdentifier: + Id: d32855055305ce5489c69379e2219a7d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta new file mode 100644 index 0000000000..6bde18c873 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 927209024a2e722458a308e2433956cb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset b/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset new file mode 100644 index 0000000000..448d98e21a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SMES + m_EditorClassIdentifier: + Id: b38ae683afaacc4419ac13936cecd1a5 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta new file mode 100644 index 0000000000..5cb14af93f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b02816e423698b4590effe2b46616a4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset b/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset new file mode 100644 index 0000000000..f9c5153c17 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Scrubber + m_EditorClassIdentifier: + Id: be5174cd6c3daf64a9739aff0f747a91 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta new file mode 100644 index 0000000000..a6f856f198 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b10b6c6238a5a814ba6737bfa63bc4c3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset b/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset new file mode 100644 index 0000000000..c2d3c5cd3f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SecurityAirlock + m_EditorClassIdentifier: + Id: d25b39d1e2379b64cba47629530ada78 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta new file mode 100644 index 0000000000..53846ba6ab --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a88eb8e09990e854d81539973299f61f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset b/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset new file mode 100644 index 0000000000..e7eb681964 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SecurityLocker + m_EditorClassIdentifier: + Id: dd3ce5340ed4aba4babae7020f737084 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta new file mode 100644 index 0000000000..397ef1cfe7 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 534d22d36c7a7df49adb294f3e2118a5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset b/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset new file mode 100644 index 0000000000..8ff557364a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Sink + m_EditorClassIdentifier: + Id: 1e0936c2ffa28eb419deda61c5c1cb8a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta new file mode 100644 index 0000000000..ca98a3afa6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0b8c9665d651934382cdad26ffa8081 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset b/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset new file mode 100644 index 0000000000..347144ef3d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SleeperBed + m_EditorClassIdentifier: + Id: d27600b4734eb3a4284be037a2f9d02b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta new file mode 100644 index 0000000000..d2f8410214 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba51a5776f8c1d942925425a344831a5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset b/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset new file mode 100644 index 0000000000..8f0b718cbd --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SlotMachine + m_EditorClassIdentifier: + Id: 9f028e95d4196b141acf363c01d24806 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta new file mode 100644 index 0000000000..5d6bc46c3b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad014a0995d51f64992e3022889cf64d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset b/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset new file mode 100644 index 0000000000..adb8ae083a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SolarPanel + m_EditorClassIdentifier: + Id: f0eca2b8867709749bc10f61917c4bdf + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta new file mode 100644 index 0000000000..b8d73f31e8 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38fc09810330bbd4bba345e3f9592199 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset b/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset new file mode 100644 index 0000000000..4561ac4b00 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SolarTrackingBeacon + m_EditorClassIdentifier: + Id: 50405f05821f58c49a8badc89506b019 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta new file mode 100644 index 0000000000..d1b4cadbbf --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b27d3b93e8709f840a9f1aab59a9cc75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset new file mode 100644 index 0000000000..a98f8d7945 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableBoozeDispenser + m_EditorClassIdentifier: + Id: 7b74e45100446b440b4b0a12cd6d05ef + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta new file mode 100644 index 0000000000..820d2f6247 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a73deecf4da493441be493a67fe479ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset new file mode 100644 index 0000000000..b19750c91a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableFrameSteel + m_EditorClassIdentifier: + Id: e9009aff81f29eb429148fd71961539f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta new file mode 100644 index 0000000000..72d0645f24 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4e3ed17ef66be443b04296dab2a7ae5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset new file mode 100644 index 0000000000..708a4b8be3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableFrameWood + m_EditorClassIdentifier: + Id: 672b544ba53de0144aab307a16b085cb + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta new file mode 100644 index 0000000000..4ebd9acc56 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7a0afa03215be246be78ab71e2e2571 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset new file mode 100644 index 0000000000..c725d764d6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableGlass + m_EditorClassIdentifier: + Id: 4d48472d06930bd42a15897e6a1794ac + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta new file mode 100644 index 0000000000..08be31a74c --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57eec9e75508e354f8d240e6c7dfc96a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset b/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset new file mode 100644 index 0000000000..13afef4d49 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TablePoker + m_EditorClassIdentifier: + Id: ebddb1721dcbe36499e4d093e5a7ff09 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta new file mode 100644 index 0000000000..c0c4139a12 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ba25a1b639ddcd489a491e3bbc3eb03 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset new file mode 100644 index 0000000000..13b2c30c95 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableSteel + m_EditorClassIdentifier: + Id: 6caa99f8281726e40a793826d5c047db + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta new file mode 100644 index 0000000000..267df96dbe --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3930eec4b86e7746a89c6c716e27798 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset new file mode 100644 index 0000000000..f2ee3d08b6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableWood + m_EditorClassIdentifier: + Id: 5e8a02c5ce0073644ac01bdb55d72a70 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta new file mode 100644 index 0000000000..60cf293c08 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00bc0b62e52334e43b318cac04a821cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset new file mode 100644 index 0000000000..734a29ec36 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileBar + m_EditorClassIdentifier: + Id: 75680e6a1df5ff547bdb5b8f116f766b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta new file mode 100644 index 0000000000..2d523e1609 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6e23e6ec76da7c4eaf5f33cbc356f8e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset new file mode 100644 index 0000000000..e52ceb5146 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileDirt1 + m_EditorClassIdentifier: + Id: 0ef9cea3bb74e6c4788f77e711f92d4d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta new file mode 100644 index 0000000000..2e046d1a65 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 41904bd2be19b8d4f9b54bcb4c35e4b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset new file mode 100644 index 0000000000..cc2d07b460 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileGrass + m_EditorClassIdentifier: + Id: 501391c27a7f94c4d8c937f00a9ceb9f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta new file mode 100644 index 0000000000..ebdd4dd79d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b7b691c97678ca44b6e350dac1fe15f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset new file mode 100644 index 0000000000..28d7a021ca --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileGrey + m_EditorClassIdentifier: + Id: 7a47e5b68d8bab647b3f99ee3af524c7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta new file mode 100644 index 0000000000..f84d79c441 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbff915a0c8dd9442b22781f2358017c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset new file mode 100644 index 0000000000..bb7a9ca23c --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileGreyDark + m_EditorClassIdentifier: + Id: 6873d7cf62d6ebc42966423161b799f1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta new file mode 100644 index 0000000000..f3fe3497f7 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf2d801ddd077fc42824b5fbfb3f4dec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset new file mode 100644 index 0000000000..97bd247594 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileKitchen + m_EditorClassIdentifier: + Id: 5ecf13819099b014eb5f731155540586 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta new file mode 100644 index 0000000000..b5cdb0afa1 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13636a93db27869488e3530c24cb465e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset new file mode 100644 index 0000000000..530adb440f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayBlue + m_EditorClassIdentifier: + Id: 821d0946be816bb42a0eed24631d57ee + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta new file mode 100644 index 0000000000..0f84246c94 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65c0502418577df42af3550984f4d3e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset new file mode 100644 index 0000000000..1f329412bb --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayBrown + m_EditorClassIdentifier: + Id: 3a7b793253e1a0f4587097192998c361 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta new file mode 100644 index 0000000000..81d6597365 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abb8c67566bdcf9438e555572a418bcc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset new file mode 100644 index 0000000000..9ca9ccfdff --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayGreen + m_EditorClassIdentifier: + Id: b3e652487789fe54d8d24245d5962c3a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta new file mode 100644 index 0000000000..7cb93622ba --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d14164a0dea844d4b87267ce6b740365 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset new file mode 100644 index 0000000000..42cb8db757 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayOrange + m_EditorClassIdentifier: + Id: 6cd51fc127b8aac40b2accd3e2666202 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta new file mode 100644 index 0000000000..3f36a4432d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ca13124364b49a4e8812b39fcdf9c03 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset new file mode 100644 index 0000000000..b446a41eb3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayPurple + m_EditorClassIdentifier: + Id: 14df766b77b0daf4b82ad93125f66782 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta new file mode 100644 index 0000000000..c05db81629 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b58ca8ffc283af542b756a32df865f58 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset new file mode 100644 index 0000000000..c20084afcc --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayRed + m_EditorClassIdentifier: + Id: 5e24183c4537dcf47b16fde5ab1ce0ea + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta new file mode 100644 index 0000000000..3f57846f6f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51754ff4045cce948a7d03d37ac3ed54 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset b/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset new file mode 100644 index 0000000000..903eb2337a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TilePlating + m_EditorClassIdentifier: + Id: 8686fbdb413e33b4395a775c4f2ba990 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta new file mode 100644 index 0000000000..a07867e215 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 663cae2ee60f36940a4e26dc0b3bf960 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset new file mode 100644 index 0000000000..11f25f79bc --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileReinforced + m_EditorClassIdentifier: + Id: df4cf328d472de046bcbc073cbda2868 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta new file mode 100644 index 0000000000..4afbfc9f77 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ab72d74a57157a4fba259b6707a1234 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset new file mode 100644 index 0000000000..307936c91a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileWhite + m_EditorClassIdentifier: + Id: 61201f10ccc2856459a9de99d9cdc52e + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta new file mode 100644 index 0000000000..19fe894f08 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5a9093f9ed950049869333d55ef39ea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset new file mode 100644 index 0000000000..ee9605f0ae --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileWood + m_EditorClassIdentifier: + Id: 49f2097d4710d114a89821d9164dfce2 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta new file mode 100644 index 0000000000..b22971e09f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da803d5b339bf404eadd61c6f3b84474 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset b/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset new file mode 100644 index 0000000000..177af935da --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: VendorHotDrinks + m_EditorClassIdentifier: + Id: b7976a98a25be4543ba45f1d5e26c072 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta new file mode 100644 index 0000000000..09e21c113f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 147f3795b10839d4cbcc1d34086d1b1f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset b/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset new file mode 100644 index 0000000000..f4e23e6e5b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: VendorRobustSoftdrinks + m_EditorClassIdentifier: + Id: 93faf7e7a5c67b9478c57a0d03340256 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta new file mode 100644 index 0000000000..2ce29d8738 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bef70bf5ad92da45afa079fa69185b5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset b/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset new file mode 100644 index 0000000000..e552988296 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: VendorSecTech + m_EditorClassIdentifier: + Id: 6f2976f635940684da7f7f4ed7855a8d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta new file mode 100644 index 0000000000..a867713321 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32c17bc4bdd2e8a43a4957440b5a1822 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset b/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset new file mode 100644 index 0000000000..4b6d9a8258 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: VendorYouTool + m_EditorClassIdentifier: + Id: cc1b7e8558e50594089a64af537ff781 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta new file mode 100644 index 0000000000..ddeb45dc15 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4e9603aa7cef9341be50d058b95d0d5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset b/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset new file mode 100644 index 0000000000..df83042b34 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Vent + m_EditorClassIdentifier: + Id: bb2ccbe283c7a7d459f283a7483e04b9 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta new file mode 100644 index 0000000000..3d081ce4de --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c05dfac29f4de184e8dcb9be586d1d72 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset b/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset new file mode 100644 index 0000000000..a197c46509 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: WaterCooler + m_EditorClassIdentifier: + Id: 0188e95eec8518246940499957802de9 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta new file mode 100644 index 0000000000..40b5c4ccc4 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e00ebdb1aa55d3a40ab6a8c03d1d0529 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset b/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset new file mode 100644 index 0000000000..cc2c8523e2 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: WaterTank + m_EditorClassIdentifier: + Id: d675e0c37e3147a4b8501314b5106f13 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta new file mode 100644 index 0000000000..063b5078fb --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b3e7d5b83122c048bf3679e7e38edd2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SS3D/Data/Generated/Items.cs b/Assets/Scripts/SS3D/Data/Generated/Items.cs index 079dc3d5d4..048b8746b8 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Items.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Items.cs @@ -3,19 +3,39 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class Items { + public const string AirAlarm = "11a2276338ebc64429dfc565b491e437"; + public const string APC = "4c966398d6624164c910cd29c1faa980"; + public const string AtmosPipesL1 = "de6f06ad18d50134295959f438ba9c5d"; + public const string AtmosPipesL2 = "251dc2a5fbda518429c8205c3b62165f"; + public const string AtmosPipesL3 = "adc07a7f0fee8304691f45a201509b13"; + public const string AtmosPipesL4 = "48efd00c91c310e4bb965d025c63b3ba"; public const string Backpack = "ddaa28fac1956b2428aff1dac1d89707"; public const string BikeHorn = "11f824c472e04854e95065dda095e8f4"; + public const string Blender = "5a09b3e93f0022b468da150e3c4a78c6"; public const string Boombox = "1d2cf546d53e3fe4c9103007427aaec7"; public const string BrutePatch = "b5be0a52925e2674193d081d2deb68cb"; public const string BurnPatch = "162e188d33a82b440a239f20901c716a"; + public const string Cables = "92d3eb280886ba74cb1e19f4e01669a7"; + public const string Catwalk = "a28267798293970468ab30803632a3f7"; + public const string ChemicalDispenser = "829e74fee2b909242821055cc2b096e0"; + public const string CivillianAirlock = "84a5596b28f449e49bb34741abf89d30"; public const string Crowbar = "7becfab153276864f9fc7636a839d837"; + public const string Cryotube = "081d9ee3e54295d49a4970a88f4943a9"; + public const string DinnerBooth = "85fa4c9b76b4b23458dcf24a745a1dfe"; + public const string DisposalBin = "23a169aefca62c4418b6efec13df595e"; + public const string DisposalOutlet = "7c6bebf2e12702d48abd76acad4d1272"; + public const string DisposalPipes = "12a989ad41a83a3468d1ae9aff9628d3"; public const string DonkPocket = "56b1aff2041026242bed0f064dee56bb"; public const string Doodad = "f6528d8afa18fa14998a0158260ef26c"; public const string ElectricalCable = "0e69918696f58e04f846e985ec7405fe"; public const string ElectricalWire = "cc71128d4bcc0c548ac11481000ac424"; public const string FacewearGasMask = "bf177f8bab26bc84b87fd9a971004418"; + public const string FancyCarpetRed = "9b8a1328991fc2846bc55a3d9a82e5c0"; + public const string FireAlarm = "50dd6be959d44844ab1abf8a3f2adb01"; public const string FlashlightBlue = "781dd9024aaa53444bc3deeaa9708fbb"; public const string FloorTile = "404443f7c306fc8469698745624fa3bf"; + public const string FuelTank = "852d57bdb0508494fb6047f36e813c69"; + public const string Gibber = "ad055c3d74a711a4b9d9b31217883a03"; public const string GlassReinforcedSheet = "a1a7407e08bb2914c97f431063bf83e2"; public const string GlassShard = "5cab1a9f6c7f74948b84d0d625319efe"; public const string GlassSheet = "e2a06f02e6a7e0348bdc535344bfe1f3"; @@ -46,30 +66,60 @@ public static class Items public const string HumanStomach = "2bc6f6a968d5ba04c919ba56d0ccdab4"; public const string HumanTorso = "4a9d34a6cf84ef045a740513d8ae30b1"; public const string IDCard = "d8b0c8d1ddcdeb24d9763054c103c9fe"; + public const string JukeboxBlueGreen = "8dc5399c58290d54f9a6cc2f6c1c9d9f"; public const string JumpsuitBotany = "be3fcf1a74268ad49bfedb1edd9f5318"; public const string JumpsuitEngineer = "7436f4976849b994aaee40df1bca7d89"; public const string JumpsuitGrey = "236b51ddc6f9aa94ca92579082370c06"; public const string JumpsuitSecurity = "93ad90421a3b2f64e8fdb9e95a42ba90"; public const string KitchenKnife = "411b513efc8f06a40aecfc47d0c5fc5a"; + public const string Lattice = "854451834f026fb4f860bf0e977a104c"; + public const string LightBulbFixture = "98ce0a84deb394b4bbd18f31f368317c"; + public const string LightSwitch = "d07b5fba3896ff448855d6e54356c365"; + public const string LightTubeFixture = "66f6206faf2f7fb4a993d935c83fc239"; + public const string Locker = "fa1909e0d40b4cf408ff599df7a2043f"; + public const string LockerSecure = "330d85a67a5891145bd8037dde90f37b"; + public const string MachineFrame = "bdeac5e9a27546348a584caa74f00ec7"; public const string MatterBin = "ed77d98d3e75b7946b404face1fe8f82"; public const string MedicalPatch = "2332a158259900e4f8a237fa8daff266"; public const string Medkit = "1e64a1c37be1f7c44a5d242d6ec6da10"; public const string MicroLaser = "84cec183559b4954c883b11f20f767c9"; + public const string Microwave = "11d64ed349b96ec4780c4dda0ad89daf"; + public const string Mirror = "a777a6da30f0704478e25312963a8151"; public const string Mug = "d9aabfd5d726a7f499b8e360d919eba4"; public const string Multitool = "2ca5f2886cf2f19428b50bf284689b86"; public const string NuclearAuthenticationDisk = "1ae18785d74e9fa4699b6f6de889c243"; + public const string NukeCart = "add4d1bc2d874d94782d6b8c912af5e2"; + public const string OfficeChair = "7a895b269e3f67241af148d25331f5af"; + public const string OfficeChairBlue = "51049866c35db47418dfe5e78bee76e7"; + public const string OfficeChairGrey = "7e7706a54d61daa47857aadd94b37002"; public const string OxygenTank = "5479411218b869144b7d09d6db6dc58e"; + public const string PacManGenerator = "45cc43b84ee58e644b9523cb27682b39"; public const string PDA = "79260483ae5d3e04fa272e092b49abac"; + public const string Plant0 = "41d7af24659a0d3439668aeb4c46d9bc"; + public const string Plant7 = "8ae2f499d25bfcd41bf26b735c852ab1"; public const string PlasmaTank = "e3fb39f0a84acf541b6ee828550a1708"; + public const string PlasticChair = "4a1bd08646e8e1f4a861960d9b7485f8"; + public const string PlasticChairBlue = "ad124dd2ec7d83344a20a44fad208ca0"; + public const string PlasticChairGrey = "3a25eb0bd251b5847af05fb59feff383"; public const string Plenum = "3b33b5cf16a677a4e85a110679cde32a"; public const string Poster = "b044d7bdb55405046a9055726a779eb1"; + public const string PosterHorizontal = "fdaaabc96a55d824a86a3636906240c1"; + public const string PosterVertical = "0d6ab6288624c7348bdcbfb81d07088f"; public const string PowerCell = "de67200a4c96d444f800399a033ddfef"; public const string PowerCellAdmin = "c69ed93dc225ea049bbf1a02662c48c0"; + public const string PowerCellCharger = "d32855055305ce5489c69379e2219a7d"; public const string ScrewdriverBlue = "9c8363ee7f934bd4b8ee5a2e30da1269"; + public const string Scrubber = "be5174cd6c3daf64a9739aff0f747a91"; + public const string SecurityAirlock = "d25b39d1e2379b64cba47629530ada78"; public const string SecurityIDCard = "ff95abc9c2b779340a1b50f1a128a934"; + public const string SecurityLocker = "dd3ce5340ed4aba4babae7020f737084"; public const string SecurityPDA = "2a63163a4db141744a802f3ff67087db"; public const string ShoeHiTops = "81faf4debf00a0a478b924176f48d011"; public const string ShoeJackboots = "535ed7c02b5cbdc43ae2b234a963c5cc"; + public const string Sink = "1e0936c2ffa28eb419deda61c5c1cb8a"; + public const string SleeperBed = "d27600b4734eb3a4284be037a2f9d02b"; + public const string SlotMachine = "9f028e95d4196b141acf363c01d24806"; + public const string SMES = "b38ae683afaacc4419ac13936cecd1a5"; public const string SodaCanBeepsSoda = "f490a74616c067c4f83995017e10b420"; public const string SodaCanBeepyLime = "4e6899916bc8fd742a07f32b3a04de12"; public const string SodaCanCannedAir = "e4281cb43d1443d4388737777fdd98d8"; @@ -77,6 +127,8 @@ public static class Items public const string SodaCanCola = "92d6696a323ef66448190e8e9d69fd22"; public const string SodaCanDukePurpleTea = "177428b73bad0fb4a89d1a64b85629bf"; public const string SodaCanTonic = "a7c35693adae32f43b4d7fe2eb8b091b"; + public const string SolarPanel = "f0eca2b8867709749bc10f61917c4bdf"; + public const string SolarTrackingBeacon = "50405f05821f58c49a8badc89506b019"; public const string SteelGirder = "6c2559c2017ada740b245951a23c2e1d"; public const string SteelGirderUnbolted = "5dba4171f2124fb48b0e32c0e10841e0"; public const string SteelReinforcedSheet = "f88a398ad3d01454f955de9c337d9b99"; @@ -87,9 +139,39 @@ public static class Items public const string SteelWindow = "b9c224febb4233f4e912745553097652"; public const string SteelWindowReinforced = "f2493b5478dd8e946ba98861f533362e"; public const string Sunglasses = "9b9f6bd470226a74b903e74dbe9e423a"; + public const string TableBoozeDispenser = "7b74e45100446b440b4b0a12cd6d05ef"; + public const string TableFrameSteel = "e9009aff81f29eb429148fd71961539f"; + public const string TableFrameWood = "672b544ba53de0144aab307a16b085cb"; + public const string TableGlass = "4d48472d06930bd42a15897e6a1794ac"; + public const string TablePoker = "ebddb1721dcbe36499e4d093e5a7ff09"; + public const string TableSteel = "6caa99f8281726e40a793826d5c047db"; + public const string TableWood = "5e8a02c5ce0073644ac01bdb55d72a70"; + public const string TileBar = "75680e6a1df5ff547bdb5b8f116f766b"; + public const string TileDirt1 = "0ef9cea3bb74e6c4788f77e711f92d4d"; + public const string TileGrass = "501391c27a7f94c4d8c937f00a9ceb9f"; + public const string TileGrey = "7a47e5b68d8bab647b3f99ee3af524c7"; + public const string TileGreyDark = "6873d7cf62d6ebc42966423161b799f1"; + public const string TileKitchen = "5ecf13819099b014eb5f731155540586"; + public const string TileOverlayBlue = "821d0946be816bb42a0eed24631d57ee"; + public const string TileOverlayBrown = "3a7b793253e1a0f4587097192998c361"; + public const string TileOverlayGreen = "b3e652487789fe54d8d24245d5962c3a"; + public const string TileOverlayOrange = "6cd51fc127b8aac40b2accd3e2666202"; + public const string TileOverlayPurple = "14df766b77b0daf4b82ad93125f66782"; + public const string TileOverlayRed = "5e24183c4537dcf47b16fde5ab1ce0ea"; + public const string TilePlating = "8686fbdb413e33b4395a775c4f2ba990"; + public const string TileReinforced = "df4cf328d472de046bcbc073cbda2868"; + public const string TileWhite = "61201f10ccc2856459a9de99d9cdc52e"; + public const string TileWood = "49f2097d4710d114a89821d9164dfce2"; public const string Toolbelt = "40d904629802fc942860ce878e78efef"; public const string ToolboxBlue = "264ea51d92067c14ebc6633999afac78"; public const string TruckerCap = "1ef3c21a685ec2d4e9f0876719839d5f"; + public const string VendorHotDrinks = "b7976a98a25be4543ba45f1d5e26c072"; + public const string VendorRobustSoftdrinks = "93faf7e7a5c67b9478c57a0d03340256"; + public const string VendorSecTech = "6f2976f635940684da7f7f4ed7855a8d"; + public const string VendorYouTool = "cc1b7e8558e50594089a64af537ff781"; + public const string Vent = "bb2ccbe283c7a7d459f283a7483e04b9"; + public const string WaterCooler = "0188e95eec8518246940499957802de9"; + public const string WaterTank = "d675e0c37e3147a4b8501314b5106f13"; public const string Welder = "06d944205e6b6dd489af078fa85fb878"; public const string Wirecutters = "41a1c8c211dc32c4d8ffca5f0892f9dc"; public const string WoodLog = "2767aeb6e6fd53b43a1cb305789834d4"; From 8fb8751e4a31b0265004e59cd892c432e31a2bd4 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:42:12 -0500 Subject: [PATCH 16/54] Rename WorldObjectAssetReference to ObjectAssetReference and update references throughout the codebase for consistency --- .../AssetDatabasesCodeGenerator.cs | 70 +++++++++---------- .../AssetDatabases/AssetReferenceActor.cs | 7 +- .../Data/AssetDatabases/IWorldObjectAsset.cs | 4 +- ...etReference.cs => ObjectAssetReference.cs} | 8 +-- ...e.cs.meta => ObjectAssetReference.cs.meta} | 0 Assets/Scripts/SS3D/Data/Assets.cs | 2 +- .../SS3D/Systems/Audio/AudioSubSystem.cs | 2 +- Assets/Scripts/SS3D/Systems/Audio/Boombox.cs | 2 +- .../SS3D/Systems/Audio/NoisyCollision.cs | 10 +-- .../SS3D/Systems/Crafting/CraftingMenu.cs | 2 +- .../SS3D/Systems/Crafting/CraftingRecipe.cs | 2 +- .../Systems/Crafting/CraftingSubSystem.cs | 8 +-- .../SS3D/Systems/Crafting/RecipeStep.cs | 6 +- .../SS3D/Systems/Crafting/RecipeStepLink.cs | 4 +- .../SS3D/Systems/Crafting/SecondaryResult.cs | 4 +- .../SS3D/Systems/Inventory/Items/Item.cs | 4 +- Assets/Scripts/SS3D/Systems/Roles/RoleData.cs | 8 +-- .../Scripts/SS3D/Systems/Roles/RoleLoadout.cs | 6 +- .../SS3D/Systems/Roles/RoleSubSystem.cs | 4 +- .../Tile/PlacedObjects/PlacedTileObject.cs | 4 +- .../SS3D/Systems/Tile/SO/GenericObjectSo.cs | 2 +- .../ConstructionHologramManager.cs | 2 +- 22 files changed, 78 insertions(+), 83 deletions(-) rename Assets/Scripts/SS3D/Data/AssetDatabases/{WorldObjectAssetReference.cs => ObjectAssetReference.cs} (89%) rename Assets/Scripts/SS3D/Data/AssetDatabases/{WorldObjectAssetReference.cs.meta => ObjectAssetReference.cs.meta} (100%) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs index 470790d3ad..18269ab921 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs @@ -1,8 +1,6 @@ #if UNITY_EDITOR using Coimbra; -using JetBrains.Annotations; using Serilog; -using System; using System.Collections.Generic; using System.Linq; using UnityEditor; @@ -17,11 +15,11 @@ namespace SS3D.Data.AssetDatabases public static class AssetDatabasesCodeGenerator { /// - /// The path in the project where to put the WorldObjectAssetReference assets. + /// The path in the project where to put the ObjectAssetReference assets. /// private static readonly string WorldObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; - private static readonly Dictionary SavedAssetReferences = new Dictionary(); + private static readonly Dictionary SavedAssetReferences = new Dictionary(); private static bool HasModifiedAssetsWhenGenerating; @@ -85,66 +83,66 @@ private static void CreateWorldObjectAssetReferences(AssetDatabase assetDatabase continue; } - WorldObjectAssetReference worldObjectAssetReference = SavedAssetReferences.Values.ToList().Find(reference => reference.Id == guid && reference.Database == assetDatabase.DatabaseID); + ObjectAssetReference objectAssetReference = SavedAssetReferences.Values.ToList().Find(reference => reference.Id == guid && reference.Database == assetDatabase.DatabaseID); - if (worldObjectAssetReference) + if (objectAssetReference) { - UpdateWorldObjectAssetReference(worldObjectAssetReference, gameObject, ref modifiedAssets); + UpdateWorldObjectAssetReference(objectAssetReference, gameObject, ref modifiedAssets); } else { - worldObjectAssetReference = CreateWorldObjectAssetReference(gameObject.name, guid, assetDatabase.DatabaseID); + objectAssetReference = CreateWorldObjectAssetReference(gameObject.name, guid, assetDatabase.DatabaseID); string key = $"{WorldObjectAssetPath}{gameObject.name}.asset"; - if (!SavedAssetReferences.TryAdd(key, worldObjectAssetReference)) + if (!SavedAssetReferences.TryAdd(key, objectAssetReference)) { Debug.LogError($"[{nameof(AssetDatabasesCodeGenerator)}] - {key} is already on the dictionary"); continue; } - UpdateWorldObjectAssetReference(worldObjectAssetReference, gameObject, ref createdAssets); + UpdateWorldObjectAssetReference(objectAssetReference, gameObject, ref createdAssets); } } if (createdAssets > 0) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {createdAssets} {nameof(WorldObjectAssetReference)} created for {assetDatabase.DatabaseName}."); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {createdAssets} {nameof(ObjectAssetReference)} created for {assetDatabase.DatabaseName}."); } if (modifiedAssets > 0) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {modifiedAssets} {nameof(WorldObjectAssetReference)} modified for {assetDatabase.DatabaseName}."); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {modifiedAssets} {nameof(ObjectAssetReference)} modified for {assetDatabase.DatabaseName}."); } if (modifiedAssets == 0 && createdAssets == 0) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - No {nameof(WorldObjectAssetReference)} were modified or created for {assetDatabase.DatabaseName}."); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - No {nameof(ObjectAssetReference)} were modified or created for {assetDatabase.DatabaseName}."); } } - private static WorldObjectAssetReference CreateWorldObjectAssetReference(string fileName, string gameObjectID, string assetDatabaseName) + private static ObjectAssetReference CreateWorldObjectAssetReference(string fileName, string gameObjectID, string assetDatabaseName) { - WorldObjectAssetReference worldObjectAssetReference = ScriptableObject.CreateInstance(); + ObjectAssetReference objectAssetReference = ScriptableObject.CreateInstance(); - worldObjectAssetReference.Id = gameObjectID; - worldObjectAssetReference.Database = assetDatabaseName; + objectAssetReference.Id = gameObjectID; + objectAssetReference.Database = assetDatabaseName; - UnityEditor.AssetDatabase.CreateAsset(worldObjectAssetReference, $"{WorldObjectAssetPath}{fileName}.asset"); + UnityEditor.AssetDatabase.CreateAsset(objectAssetReference, $"{WorldObjectAssetPath}{fileName}.asset"); HasModifiedAssetsWhenGenerating = true; Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Creating {fileName} WorldObjectReferenceAsset as it was missing."); - return worldObjectAssetReference; + return objectAssetReference; } private static void CleanupWorldObjectAssetReferences(List assetDatabases) { - List> assetsToDestroy = new(); - List> nullSavedAssetReferences = SavedAssetReferences.Where(pair => pair.Value == null).ToList(); + List> assetsToDestroy = new(); + List> nullSavedAssetReferences = SavedAssetReferences.Where(pair => pair.Value == null).ToList(); - foreach (KeyValuePair pair in nullSavedAssetReferences) + foreach (KeyValuePair pair in nullSavedAssetReferences) { SavedAssetReferences.Remove(pair.Key); } @@ -159,7 +157,7 @@ private static void CleanupWorldObjectAssetReferences(List assetD } } - foreach (KeyValuePair savedAsset in SavedAssetReferences) + foreach (KeyValuePair savedAsset in SavedAssetReferences) { if (assetsInDatabases.TryGetValue(savedAsset.Value.Id, out string databaseID) && databaseID == savedAsset.Value.Database) { @@ -169,7 +167,7 @@ private static void CleanupWorldObjectAssetReferences(List assetD assetsToDestroy.Add(savedAsset); } - foreach (KeyValuePair asset in assetsToDestroy) + foreach (KeyValuePair asset in assetsToDestroy) { Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Destroying {asset.Value.name} as there's no prefab associated with it."); @@ -183,47 +181,47 @@ private static void LoadAllWorldObjectAssetReferences() { SavedAssetReferences.Clear(); - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Loading all {nameof(WorldObjectAssetReference)} assets under {WorldObjectAssetPath}"); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Loading all {nameof(ObjectAssetReference)} assets under {WorldObjectAssetPath}"); - string[] loadAllAssetsAtPath = UnityEditor.AssetDatabase.FindAssets($"t:{nameof(WorldObjectAssetReference)}"); + string[] loadAllAssetsAtPath = UnityEditor.AssetDatabase.FindAssets($"t:{nameof(ObjectAssetReference)}"); foreach (string assetGuid in loadAllAssetsAtPath) { string assetPath = UnityEditor.AssetDatabase.GUIDToAssetPath(assetGuid); - WorldObjectAssetReference worldObjectAssetReference = UnityEditor.AssetDatabase.LoadAssetAtPath(assetPath); + ObjectAssetReference objectAssetReference = UnityEditor.AssetDatabase.LoadAssetAtPath(assetPath); - SavedAssetReferences.Add(assetPath, worldObjectAssetReference); + SavedAssetReferences.Add(assetPath, objectAssetReference); } } /// - /// Creates the WorldObjectAssetReference asset in the correct path. + /// Creates the ObjectAssetReference asset in the correct path. /// - /// + /// /// The asset to include in this WorldObjectAsset. /// The related database. - private static void UpdateWorldObjectAssetReference(WorldObjectAssetReference worldObjectAssetReference, GameObject gameObject, ref int modifiedCount) + private static void UpdateWorldObjectAssetReference(ObjectAssetReference objectAssetReference, GameObject gameObject, ref int modifiedCount) { - if (!gameObject.TryGetComponent(out IWorldObjectAsset worldObjectAsset) || worldObjectAsset.Asset == worldObjectAssetReference) + if (!gameObject.TryGetComponent(out IWorldObjectAsset worldObjectAsset) || worldObjectAsset.Asset == objectAssetReference) { return; } - worldObjectAsset.Asset = worldObjectAssetReference; + worldObjectAsset.Asset = objectAssetReference; modifiedCount++; - SetAssetAndPrefabDirty(worldObjectAssetReference, gameObject); + SetAssetAndPrefabDirty(objectAssetReference, gameObject); Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - WorldObjectReferenceAsset reference on {gameObject.name}'s prefab was missing. Fixed."); } - private static void SetAssetAndPrefabDirty(WorldObjectAssetReference worldObjectAssetReference, GameObject gameObject) + private static void SetAssetAndPrefabDirty(ObjectAssetReference objectAssetReference, GameObject gameObject) { HasModifiedAssetsWhenGenerating = true; EditorUtility.SetDirty(gameObject); - EditorUtility.SetDirty(worldObjectAssetReference); + EditorUtility.SetDirty(objectAssetReference); } } } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetReferenceActor.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetReferenceActor.cs index 6dd0aab4eb..a3acce4f1a 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetReferenceActor.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetReferenceActor.cs @@ -1,7 +1,4 @@ using SS3D.Attributes; -using SS3D.Data.AssetDatabases; -using System.Collections; -using System.Collections.Generic; using UnityEngine; namespace SS3D.Data.AssetDatabases @@ -19,9 +16,9 @@ public class AssetReferenceActor : MonoBehaviour, IWorldObjectAsset [ReadOnly] [Header("This field is filled automatically by the AssetData system.")] #endif - private WorldObjectAssetReference _asset; + private ObjectAssetReference _asset; - public WorldObjectAssetReference Asset + public ObjectAssetReference Asset { get => _asset; set diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/IWorldObjectAsset.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/IWorldObjectAsset.cs index edd0f96bcb..c80276d75e 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/IWorldObjectAsset.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/IWorldObjectAsset.cs @@ -6,9 +6,9 @@ public interface IWorldObjectAsset { /// - /// The reference to the WorldObjectAssetReference asset, which is a way to identify which asset this is without in a more automated manner. + /// The reference to the ObjectAssetReference asset, which is a way to identify which asset this is without in a more automated manner. /// This field is setup by the AssetData system automatically when its implemented on a class. /// - public WorldObjectAssetReference Asset { get; set; } + public ObjectAssetReference Asset { get; set; } } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs similarity index 89% rename from Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs rename to Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 5169a754ee..8edad55370 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -13,11 +13,11 @@ namespace SS3D.Data.AssetDatabases /// This SO is used to reference world object assets in inspector fields without worrying about losing data. /// World object assets are anything that can be placed in the world as a GameObject, like items and tileobjects. /// - public sealed class WorldObjectAssetReference : ScriptableObject + public sealed class ObjectAssetReference : ScriptableObject { #if UNITY_EDITOR /// - /// The path in the project where to put the WorldObjectAssetReference assets. + /// The path in the project where to put the ObjectAssetReference assets. /// public static readonly string WorldObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; #endif @@ -36,7 +36,7 @@ public sealed class WorldObjectAssetReference : ScriptableObject #if UNITY_EDITOR [CanBeNull] - public static WorldObjectAssetReference Create(Object asset) + public static ObjectAssetReference Create(Object asset) { if (!asset) { @@ -45,7 +45,7 @@ public static WorldObjectAssetReference Create(Object asset) return null; } - WorldObjectAssetReference assetReference = CreateInstance(); + ObjectAssetReference assetReference = CreateInstance(); assetReference.Init(asset); string assetPath = System.IO.Path.Combine(WorldObjectAssetPath, $"{asset.name}.asset"); diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs.meta b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs.meta similarity index 100% rename from Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs.meta rename to Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs.meta diff --git a/Assets/Scripts/SS3D/Data/Assets.cs b/Assets/Scripts/SS3D/Data/Assets.cs index f3e11a4932..8fda143fac 100644 --- a/Assets/Scripts/SS3D/Data/Assets.cs +++ b/Assets/Scripts/SS3D/Data/Assets.cs @@ -41,7 +41,7 @@ public static TAsset Get([NotNull] string databaseId, [NotNull] string a /// Returns an asset from a database casting the object found to TAsset. /// [CanBeNull] - public static TAsset Get([NotNull] WorldObjectAssetReference assetReference) + public static TAsset Get([NotNull] ObjectAssetReference assetReference) where TAsset : Object { return GetDatabase(assetReference.Database)?.Get(assetReference.Id); diff --git a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs index a1b6d755ee..9924917a38 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs @@ -251,7 +251,7 @@ private static void CreateAudioClipReference() foreach (AudioClip selectedClip in selectedClips) { - WorldObjectAssetReference.Create(selectedClip); + ObjectAssetReference.Create(selectedClip); } } #endif diff --git a/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs b/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs index ee1c1c7da1..c2ef86eff5 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs @@ -19,7 +19,7 @@ public class Boombox : InteractionTargetNetworkBehaviour, IToggleable private MachinePowerConsumer _powerConsumer; [SerializeField] - private List _songReferences; + private List _songReferences; [SyncVar] public bool AudioOn; diff --git a/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs b/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs index 117fd05d65..d93e5cfb08 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs @@ -53,7 +53,7 @@ public class NoisyCollision : MonoBehaviour [SerializeField] [Tooltip("List of references of possible sounds that will play when this object collides lightly.")] - private WorldObjectAssetReference[] _lightImpactSoundReferences; + private ObjectAssetReference[] _lightImpactSoundReferences; // [SerializeField] // [Tooltip("List of possible sounds that will play when this object collides heavily.")] @@ -61,7 +61,7 @@ public class NoisyCollision : MonoBehaviour [SerializeField] [Tooltip("List of references of possible sounds that will play when this object collides heavily.")] - private WorldObjectAssetReference[] _hardImpactSoundReferences; + private ObjectAssetReference[] _hardImpactSoundReferences; //For some reason, this is needed to have an enable/disable feature. Peculiar. private void FixedUpdate() { } @@ -101,17 +101,17 @@ private void OnCollisionEnter(Collision other) /// /// [Server] - private void PlayCollisionSound(WorldObjectAssetReference[] soundPool) + private void PlayCollisionSound(ObjectAssetReference[] soundPool) { float pitch = Random.Range(_basePitch - _pitchModulationLow, _basePitch + _pitchModulationHigh); SubSystems.Get().PlayAudioSource(AudioType.Sfx, PickSound(soundPool).Id, gameObject.transform.position, null, false, _collisionVolume, pitch); } - private WorldObjectAssetReference PickSound(WorldObjectAssetReference[] availableSounds) + private ObjectAssetReference PickSound(ObjectAssetReference[] availableSounds) { // Pick a clip from the supplied array and return it - WorldObjectAssetReference currentClipReference = availableSounds[Random.Range(0, availableSounds.Length)]; + ObjectAssetReference currentClipReference = availableSounds[Random.Range(0, availableSounds.Length)]; return currentClipReference; } diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs index 110e3295b5..057b306c15 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs @@ -186,7 +186,7 @@ private void SetSelectedInteraction(int index, NetworkConnection conn = null) _interactionEvent = _eventForConnection[conn]; List results = new(); - if (_interaction.ChosenLink.Target.IsTerminal && _interaction.ChosenLink.Target.TryGetResult(out WorldObjectAssetReference result)) + if (_interaction.ChosenLink.Target.IsTerminal && _interaction.ChosenLink.Target.TryGetResult(out ObjectAssetReference result)) { results.Add(new (result, 1)); } diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs index 63a973803e..75fb8b870e 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs @@ -15,7 +15,7 @@ namespace SS3D.Systems.Crafting public class CraftingRecipe : ScriptableObject { [Tooltip("The target of the crafting, what needs to be clicked on by the player to start the crafting.")] - public WorldObjectAssetReference Target; + public ObjectAssetReference Target; [Tooltip("A bunch of recipe steps, representing each steps of the recipe.")] public List Steps; diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs index c864c66ef5..73d2b23c37 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs @@ -31,7 +31,7 @@ namespace SS3D.Systems.Crafting public sealed class CraftingSubSystem : NetworkSubSystem { /// - /// First string is the id of the target object of the recipe (as the WorldObjectAssetReference's id). + /// First string is the id of the target object of the recipe (as the ObjectAssetReference's id). /// The value is a list of craftingRecipe, for which the target is the key. /// private readonly Dictionary> _recipeOrganiser = new(); @@ -141,7 +141,7 @@ public void Craft(CraftingInteraction interaction, InteractionEvent interactionE ModifyOrConsumeRecipeTarget(recipeTarget, interaction, interactionEvent, link); - if (link.Target.TryGetResult(out WorldObjectAssetReference result)) + if (link.Target.TryGetResult(out ObjectAssetReference result)) { SpawnOrModifyMainResult(result, interaction, interactionEvent, link); } @@ -185,7 +185,7 @@ private void ModifyOrConsumeRecipeTarget(IRecipeIngredient recipeTarget, Craftin } } - private void SpawnOrModifyMainResult(WorldObjectAssetReference result, CraftingInteraction interaction, + private void SpawnOrModifyMainResult(ObjectAssetReference result, CraftingInteraction interaction, InteractionEvent interactionEvent, TaggedEdge link) { GameObject resultInstance; @@ -551,7 +551,7 @@ private bool TargetIsValid(InteractionEvent interactionEvent) [Server] private bool ResultIsValid(InteractionEvent interactionEvent, RecipeStep recipeStep) { - if (!recipeStep.TryGetResult(out WorldObjectAssetReference recipeResult)) return true; + if (!recipeStep.TryGetResult(out ObjectAssetReference recipeResult)) return true; GameObject recipeResultPrefab = Assets.Get(recipeResult); diff --git a/Assets/Scripts/SS3D/Systems/Crafting/RecipeStep.cs b/Assets/Scripts/SS3D/Systems/Crafting/RecipeStep.cs index 7d4d8547fe..e8eb177ca0 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/RecipeStep.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/RecipeStep.cs @@ -45,7 +45,7 @@ public class RecipeStep [ShowIf(nameof(IsTerminal))] [AllowNesting] [Tooltip("A resulting object that will spawn at the end of the crafting process, optional.")] - public WorldObjectAssetReference Result; + public ObjectAssetReference Result; /// /// If true, show IsInitialState in the inspector @@ -57,7 +57,7 @@ public class RecipeStep /// public string Name => _name; - public WorldObjectAssetReference GetResultOrTarget() => Result ? Result : Recipe.Target; + public ObjectAssetReference GetResultOrTarget() => Result ? Result : Recipe.Target; public RecipeStep(CraftingRecipe recipe, string name) { @@ -68,7 +68,7 @@ public RecipeStep(CraftingRecipe recipe, string name) Result = new(); } - public bool TryGetResult(out WorldObjectAssetReference result) + public bool TryGetResult(out ObjectAssetReference result) { result = Result; return Result is not null; diff --git a/Assets/Scripts/SS3D/Systems/Crafting/RecipeStepLink.cs b/Assets/Scripts/SS3D/Systems/Crafting/RecipeStepLink.cs index f0e9695f83..b4aa57f245 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/RecipeStepLink.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/RecipeStepLink.cs @@ -15,7 +15,7 @@ public class RecipeStepLink { [Tooltip("Elements of the recipe, that will be consumed in the crafting process, and the necessary number of each.")] [SerializeField] - private SerializableDictionary _elements = new(); + private SerializableDictionary _elements = new(); [Tooltip("Bunch of conditions for ingredients to be valid to use in the recipe.")] [SerializeField] @@ -91,7 +91,7 @@ public Dictionary Elements { Dictionary elements = new(); - foreach (KeyValuePair keyValuePair in _elements) + foreach (KeyValuePair keyValuePair in _elements) { elements.Add(keyValuePair.Key.Id, keyValuePair.Value); } diff --git a/Assets/Scripts/SS3D/Systems/Crafting/SecondaryResult.cs b/Assets/Scripts/SS3D/Systems/Crafting/SecondaryResult.cs index f47d297f0b..82f8fac44d 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/SecondaryResult.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/SecondaryResult.cs @@ -6,10 +6,10 @@ namespace SS3D.Systems.Crafting [Serializable] public struct SecondaryResult { - public WorldObjectAssetReference Asset; + public ObjectAssetReference Asset; public uint Amount; - public SecondaryResult(WorldObjectAssetReference asset, uint amount) + public SecondaryResult(ObjectAssetReference asset, uint amount) { Asset = asset; Amount = amount; diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs index 15362c91e4..eb7baebe80 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs @@ -39,7 +39,7 @@ public class Item : InteractionSource, IInteractionTarget, IWorldObjectAsset [ReadOnly] [Header("This field is filled automatically by the AssetData system.")] #endif - private WorldObjectAssetReference _asset; + private ObjectAssetReference _asset; #region Item [Header("Item settings")] @@ -107,7 +107,7 @@ public Collider[] NativeColliders set => _nativeColliders = value; } - public WorldObjectAssetReference Asset + public ObjectAssetReference Asset { get => _asset; set diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs index 0daeada4c1..f4d993f744 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs @@ -15,9 +15,9 @@ public class RoleData : ScriptableObject [SerializeField] private string _roleName; [SerializeField] - private WorldObjectAssetReference _pdaAsset; + private ObjectAssetReference _pdaAsset; [SerializeField] - private WorldObjectAssetReference _idCardAsset; + private ObjectAssetReference _idCardAsset; [SerializeField] private List _permissions = new(); [SerializeField] @@ -25,9 +25,9 @@ public class RoleData : ScriptableObject public string Name => _roleName; - public WorldObjectAssetReference IDCardAsset => _idCardAsset; + public ObjectAssetReference IDCardAsset => _idCardAsset; - public WorldObjectAssetReference PDAAsset => _pdaAsset; + public ObjectAssetReference PDAAsset => _pdaAsset; public List Permissions => _permissions; diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs index 55b9126747..c449091742 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs @@ -11,9 +11,9 @@ namespace SS3D.Systems.Roles [CreateAssetMenu(fileName = "Loadout", menuName = "Roles/Loadout")] public class RoleLoadout : ScriptableObject { - public WorldObjectAssetReference HandLeftAsset; - public WorldObjectAssetReference HandRightAsset; + public ObjectAssetReference HandLeftAsset; + public ObjectAssetReference HandRightAsset; - public SerializableDictionary EquipmentAssets; + public SerializableDictionary EquipmentAssets; } } diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs index 97bd3cf324..673fa1f112 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs @@ -209,7 +209,7 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) containers.Add(inventoryContainer.ContainerType, inventoryContainer); } - foreach (KeyValuePair itemToEquip in loadout.EquipmentAssets) + foreach (KeyValuePair itemToEquip in loadout.EquipmentAssets) { if (!itemToEquip.Value) { @@ -241,7 +241,7 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) /// /// Condition indicating if the item should be spawned /// Container the item will be spawned in - private Item SpawnItemInSlot(WorldObjectAssetReference assetReference, bool shouldSpawn, AttachedContainer container) + private Item SpawnItemInSlot(ObjectAssetReference assetReference, bool shouldSpawn, AttachedContainer container) { if (!shouldSpawn) { diff --git a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs index 21776e90df..9a8205ea77 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs @@ -62,7 +62,7 @@ public static PlacedTileObject Create(Vector3 worldPosition, Vector2Int origin, [ReadOnly] [Header("This field is filled automatically by the AssetData system.")] #endif - private WorldObjectAssetReference _asset; + private ObjectAssetReference _asset; [SerializeField] private TileObjectSo _tileObjectSo; @@ -96,7 +96,7 @@ public static PlacedTileObject Create(Vector3 worldPosition, Vector2Int origin, public bool HasAdjacencyConnector => _connector != null; - public WorldObjectAssetReference Asset + public ObjectAssetReference Asset { get => _asset; set diff --git a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs index a215b2be05..2e97db6395 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs @@ -12,7 +12,7 @@ public class GenericObjectSo : ScriptableObject [NotNull] public string NameString => PrefabAsset.name; - public WorldObjectAssetReference PrefabAsset; + public ObjectAssetReference PrefabAsset; public Sprite icon; [SerializeField] diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs index 260c9c60cc..6d24f1cd0a 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs @@ -174,7 +174,7 @@ public void SetNextRotation() /// /// Instantiate in the correct position and rotation a single hologram. /// - public ConstructionHologram CreateHologram(WorldObjectAssetReference prefabAsset, Vector3 position) + public ConstructionHologram CreateHologram(ObjectAssetReference prefabAsset, Vector3 position) { GameObject prefab = Assets.Get(prefabAsset); GameObject tileObject = Instantiate(prefab); From 2e6fd3fb598f1114991b4f7bc241dde564f861aa Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Wed, 4 Feb 2026 10:56:01 -0500 Subject: [PATCH 17/54] Remove unused variable --- Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs index 2e97db6395..c5cebbe471 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs @@ -14,9 +14,5 @@ public class GenericObjectSo : ScriptableObject public ObjectAssetReference PrefabAsset; public Sprite icon; - - [SerializeField] - [HideInInspector] - private string _nameString; } } \ No newline at end of file From d83d0c441d0c1d3bb1b4e6a6edde49481f379561 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Wed, 4 Feb 2026 11:07:42 -0500 Subject: [PATCH 18/54] Fix formatting and clean up conditions in DatabaseScriptWriter for improved readability --- .../CodeGeneration/Writers/DatabaseScriptWriter.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs index 8beb3940c7..fc61d2ec10 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs @@ -1,4 +1,5 @@ -using System; +#if UNITY_EDITOR +using System; using System.Collections.Generic; using System.IO; using System.Text; @@ -33,9 +34,9 @@ public static void Write(string filePath, string className, List items, { string itemPath = AssetDatabase.GetAssetPath(item); - if(string.IsNullOrEmpty(itemPath) || !File.Exists(itemPath)) + if (string.IsNullOrEmpty(itemPath)) continue; - + if (!item || string.IsNullOrWhiteSpace(item.name)) continue; @@ -44,9 +45,9 @@ public static void Write(string filePath, string className, List items, StringBuilder stringBuilder = new(); stringBuilder.Append(corrected); - + string guid = AssetDatabase.AssetPathToGUID(itemPath); - + sourceFile.AppendLine($"public const string {stringBuilder} = \"{guid}\";"); } } @@ -55,4 +56,5 @@ public static void Write(string filePath, string className, List items, File.WriteAllText(filePath + "/" + className + ".cs", sourceFile.ToString()); } } -} \ No newline at end of file +} +#endif \ No newline at end of file From 6e2810e6d0590a63f0c912821c695e46b939e199 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Wed, 4 Feb 2026 11:08:36 -0500 Subject: [PATCH 19/54] Enhance asset retrieval by updating GetAsset methods to accept ObjectAssetReference, and implement IEqualityComparer for improved comparison --- .../Data/AssetDatabases/ObjectAssetReference.cs | 14 +++++++++++++- .../Scripts/SS3D/Systems/Crafting/CraftingMenu.cs | 2 +- .../SS3D/Systems/Inventory/Containers/Hand.cs | 2 +- .../SS3D/Systems/Tile/TileResourceLoader.cs | 14 ++++++++++++++ Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs | 4 ++++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 8edad55370..1e239329f3 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -1,11 +1,14 @@ using JetBrains.Annotations; using SS3D.Attributes; +using System; +using System.Collections.Generic; using System.Linq; #if UNITY_EDITOR using UnityEditor.AddressableAssets; using UnityEditor.AddressableAssets.Settings; #endif using UnityEngine; +using Object = UnityEngine.Object; namespace SS3D.Data.AssetDatabases { @@ -13,7 +16,7 @@ namespace SS3D.Data.AssetDatabases /// This SO is used to reference world object assets in inspector fields without worrying about losing data. /// World object assets are anything that can be placed in the world as a GameObject, like items and tileobjects. /// - public sealed class ObjectAssetReference : ScriptableObject + public sealed class ObjectAssetReference : ScriptableObject, IEqualityComparer { #if UNITY_EDITOR /// @@ -34,6 +37,15 @@ public sealed class ObjectAssetReference : ScriptableObject [Header("This file is auto-generated, do not modify it manually")] public string Database; + public bool Equals(ObjectAssetReference x, ObjectAssetReference y) => x && y + && x.Id.Equals(y.Id, StringComparison.OrdinalIgnoreCase) && x.Database.Equals(y.Database, StringComparison.OrdinalIgnoreCase); + + public int GetHashCode(ObjectAssetReference reference) + { + ScriptableObject baseReference = reference; + return baseReference.GetHashCode(); + } + #if UNITY_EDITOR [CanBeNull] public static ObjectAssetReference Create(Object asset) diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs index 057b306c15..268700a991 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs @@ -230,7 +230,7 @@ private void TargetSetVisuals(NetworkConnection conn, List resu foreach (SecondaryResult result in results) { - GenericObjectSo asset = SubSystems.Get().GetAsset(result.Asset.Id); + GenericObjectSo asset = SubSystems.Get().GetAsset(result.Asset); GameObject pictureSlot = Instantiate(_pictureSlotPrefab, _pictureSlotArea.transform); pictureSlot.GetComponent().Setup(asset, result.Amount); } diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs b/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs index 523408431a..8a8fb53c98 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs @@ -137,7 +137,7 @@ public void PlaceHeldItemOutOfHand(Vector3 position, Quaternion rotation) TileMap tileMap = SubSystems.Get().CurrentMap; if (tileMap != null) { - ItemObjectSo itemObjectSo = SubSystems.Get().GetAsset(item.Asset.Id) as ItemObjectSo; + ItemObjectSo itemObjectSo = SubSystems.Get().GetAsset(item.Asset) as ItemObjectSo; if (itemObjectSo != null) { tileMap.PlaceItemObject(position, rotation, itemObjectSo, item.gameObject); diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs b/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs index c6e25bb6f3..13bbc9d657 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs @@ -1,4 +1,5 @@ using JetBrains.Annotations; +using SS3D.Data.AssetDatabases; using SS3D.Logging; using System; using System.Collections; @@ -81,5 +82,18 @@ public GenericObjectSo GetAsset(string assetName) return genericObjectSo; } + + [CanBeNull] + public GenericObjectSo GetAsset(ObjectAssetReference asset) + { + GenericObjectSo genericObjectSo = Assets.FirstOrDefault(tileObject => tileObject.PrefabAsset.Equals(asset)); + + if (!genericObjectSo) + { + Log.Warning(this, "Requested tile asset {assetName} was not found.", Logs.Generic, asset); + } + + return genericObjectSo; + } } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs b/Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs index ea91f6900a..0922852018 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs @@ -1,6 +1,7 @@ using Cysharp.Threading.Tasks; using FishNet.Object; using SS3D.Core.Behaviours; +using SS3D.Data.AssetDatabases; using SS3D.Data.Management; using SS3D.Logging; using System; @@ -81,6 +82,9 @@ private void CreateMap(string mapName) [ServerOrClient] public GenericObjectSo GetAsset(string assetName) => Loader.GetAsset(assetName); + [ServerOrClient] + public GenericObjectSo GetAsset(ObjectAssetReference asset) => Loader.GetAsset(asset); + [Server] private bool PlaceObject(GenericObjectSo genericObjectSo, Vector3 placePosition, Direction dir, bool replaceExisting) { From c64157ec5647ed1b16040874caa5711cef5eb554 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Wed, 4 Feb 2026 11:41:37 -0500 Subject: [PATCH 20/54] Refactor ObjectAssetReference class by removing IEqualityComparer implementation and simplifying equality and hash code methods --- .../SS3D/Data/AssetDatabases/ObjectAssetReference.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 1e239329f3..af37d9c460 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; using SS3D.Attributes; using System; -using System.Collections.Generic; using System.Linq; #if UNITY_EDITOR using UnityEditor.AddressableAssets; @@ -16,7 +15,7 @@ namespace SS3D.Data.AssetDatabases /// This SO is used to reference world object assets in inspector fields without worrying about losing data. /// World object assets are anything that can be placed in the world as a GameObject, like items and tileobjects. /// - public sealed class ObjectAssetReference : ScriptableObject, IEqualityComparer + public sealed class ObjectAssetReference : ScriptableObject { #if UNITY_EDITOR /// @@ -37,14 +36,9 @@ public sealed class ObjectAssetReference : ScriptableObject, IEqualityComparer x && y - && x.Id.Equals(y.Id, StringComparison.OrdinalIgnoreCase) && x.Database.Equals(y.Database, StringComparison.OrdinalIgnoreCase); + public override bool Equals(object other) => other is ObjectAssetReference otherReference && Id.Equals(otherReference.Id) && Database.Equals(otherReference.Database); - public int GetHashCode(ObjectAssetReference reference) - { - ScriptableObject baseReference = reference; - return baseReference.GetHashCode(); - } + public override int GetHashCode() => base.GetHashCode(); #if UNITY_EDITOR [CanBeNull] From d98781606c771db5beed3eafb6041d64f0491d87 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:13:25 -0500 Subject: [PATCH 21/54] Simplify asset management workflow by removing unnecessary type parameters in asset creation methods, and removing DatabaseAsset.cs usage. --- .../Creators/DatabaseAssetCreator.cs | 5 +- .../Writers/DatabaseAssetWriter.cs | 12 +- .../SS3D/Data/AssetDatabases/AssetDatabase.cs | 2 +- .../AssetDatabases/AssetDatabaseSettings.cs | 3 +- .../SS3D/Data/Generated/AssetDatabases.cs | 17 +- .../SS3D/Data/Generated/CraftingRecipes.cs | 14 +- .../SS3D/Data/Generated/InteractionIcons.cs | 14 +- Assets/Scripts/SS3D/Data/Generated/Items.cs | 186 +++++++++--------- .../Scripts/SS3D/Data/Generated/Materials.cs | 8 +- .../SS3D/Data/Generated/ParticlesEffects.cs | 8 +- Assets/Scripts/SS3D/Data/Generated/Sounds.cs | 24 ++- .../SS3D/Data/Generated/WorldSpaceUI.cs | 4 +- 12 files changed, 137 insertions(+), 160 deletions(-) diff --git a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs index 38a16f8b27..620fff1e12 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs @@ -1,5 +1,4 @@ using JetBrains.Annotations; -using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -15,7 +14,7 @@ public static class DatabaseAssetCreator /// /// Creates a list of database assets in the object path, with the defined class name and using a list of provided assets as its elements. /// - public static void CreateAtPath(string path, Type classType, string className, [NotNull] IEnumerable assets, string namespaceName = "SS3D.Data.Generated") + public static void CreateAtPath(string path, string className, [NotNull] IEnumerable assets, string namespaceName = "SS3D.Data.Generated") { IEnumerable enums = assets.Select(reference => reference.name); @@ -27,7 +26,7 @@ public static void CreateAtPath(string path, Type classType, string className, [ Directory.CreateDirectory(fullPath); } - DatabaseAssetWriter.Write(fullPath, classType, className, enums, namespaceName); + DatabaseAssetWriter.Write(fullPath, className, enums, namespaceName); if (EditorWindow.focusedWindow != null) { diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs index 9620dde6e9..74ffe4a7a6 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs @@ -1,29 +1,25 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; namespace SS3D.CodeGeneration { - public class DatabaseAssetWriter + public static class DatabaseAssetWriter { /// /// Writes a static class of a DatabaseAssets from an AssetDatabase. /// /// Where to write this file to. - /// The type of the field elements to use, mainly because assembly conflicts. /// The name of the class, currently being the asset database name /// the elements to add to this class /// the namespace name to use - public static void Write(string filePath, Type classType, string className, IEnumerable items, string namespaceName = "SS3D.Data.Enums") + public static void Write(string filePath, string className, IEnumerable items, string namespaceName = "SS3D.Data.Enums") { IEnumerable filtered = items.GroupBy(name => name).Select(nameGroup => nameGroup.Key); SourceFile sourceFile = new(); - sourceFile.AppendLine($"using {classType.Namespace}\n;"); - using (new NamespaceScope(sourceFile, namespaceName)) { sourceFile.AppendLine($"// This class is autogenerated. Do not modify manually."); @@ -46,7 +42,7 @@ public static void Write(string filePath, Type classType, string className, IEnu StringBuilder stringBuilder = new(); stringBuilder.Append(corrected); - sourceFile.AppendLine($"public static {classType.Name} {stringBuilder} = new {classType.Name}(\"{stringBuilder}\", \"{className}\");"); } + sourceFile.AppendLine($"public const string {stringBuilder} = \"{stringBuilder}\";"); } } } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs index f559bed545..aed793c552 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs @@ -144,7 +144,7 @@ public void GenerateDatabaseCode() return; } - DatabaseAssetCreator.CreateAtPath(DatabaseAssetPath, typeof(DatabaseAsset), DatabaseName, Assets.Values, DatabaseAssetNamespaceName); + DatabaseAssetCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values, DatabaseAssetNamespaceName); } #endif } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs index 963d091d95..9ffd513be4 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using Coimbra; using SS3D.Attributes; -using SS3D.CodeGeneration; using SS3D.CodeGeneration.Creators; using UnityEngine; @@ -41,7 +40,7 @@ public void CreateDatabaseCode() const string dataPath = AssetDatabase.DatabaseAssetPath; - DatabaseAssetCreator.CreateAtPath(dataPath, typeof(DatabaseAsset), "AssetDatabases", IncludedAssetDatabases); + DatabaseAssetCreator.CreateAtPath(dataPath, "AssetDatabases", IncludedAssetDatabases); } #endif } diff --git a/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs b/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs index a0bb669e4b..10207e4a1d 100644 --- a/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs +++ b/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs @@ -1,18 +1,15 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class AssetDatabases { - public static DatabaseAsset CraftingRecipes = new DatabaseAsset("CraftingRecipes", "AssetDatabases"); - public static DatabaseAsset InteractionIcons = new DatabaseAsset("InteractionIcons", "AssetDatabases"); - public static DatabaseAsset Items = new DatabaseAsset("Items", "AssetDatabases"); - public static DatabaseAsset Materials = new DatabaseAsset("Materials", "AssetDatabases"); - public static DatabaseAsset ParticlesEffects = new DatabaseAsset("ParticlesEffects", "AssetDatabases"); - public static DatabaseAsset Scenes = new DatabaseAsset("Scenes", "AssetDatabases"); - public static DatabaseAsset Sounds = new DatabaseAsset("Sounds", "AssetDatabases"); - public static DatabaseAsset WorldSpaceUI = new DatabaseAsset("WorldSpaceUI", "AssetDatabases"); + public const string CraftingRecipes = "CraftingRecipes"; + public const string InteractionIcons = "InteractionIcons"; + public const string Items = "Items"; + public const string Materials = "Materials"; + public const string ParticlesEffects = "ParticlesEffects"; + public const string Sounds = "Sounds"; + public const string WorldSpaceUI = "WorldSpaceUI"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs b/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs index 8862aaaf6d..9b463ea206 100644 --- a/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs +++ b/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs @@ -1,16 +1,14 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class CraftingRecipes { - public static DatabaseAsset WeirdComplexRecipe = new DatabaseAsset("WeirdComplexRecipe", "CraftingRecipes"); - public static DatabaseAsset SteelGirderUnboltedRecipe = new DatabaseAsset("SteelGirderUnboltedRecipe", "CraftingRecipes"); - public static DatabaseAsset SteelSheetRecipe = new DatabaseAsset("SteelSheetRecipe", "CraftingRecipes"); - public static DatabaseAsset ReinforcedWallRecipe = new DatabaseAsset("ReinforcedWallRecipe", "CraftingRecipes"); - public static DatabaseAsset SteelWallRecipe = new DatabaseAsset("SteelWallRecipe", "CraftingRecipes"); - public static DatabaseAsset SteelGirderRecipe = new DatabaseAsset("SteelGirderRecipe", "CraftingRecipes"); + public const string WeirdComplexRecipe = "WeirdComplexRecipe"; + public const string SteelGirderUnboltedRecipe = "SteelGirderUnboltedRecipe"; + public const string SteelSheetRecipe = "SteelSheetRecipe"; + public const string ReinforcedWallRecipe = "ReinforcedWallRecipe"; + public const string SteelWallRecipe = "SteelWallRecipe"; + public const string SteelGirderRecipe = "SteelGirderRecipe"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs b/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs index a937e0c016..4ccbabfb44 100644 --- a/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs +++ b/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs @@ -1,16 +1,14 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class InteractionIcons { - public static DatabaseAsset Power = new DatabaseAsset("Power", "InteractionIcons"); - public static DatabaseAsset Take = new DatabaseAsset("Take", "InteractionIcons"); - public static DatabaseAsset Open = new DatabaseAsset("Open", "InteractionIcons"); - public static DatabaseAsset Discard = new DatabaseAsset("Discard", "InteractionIcons"); - public static DatabaseAsset Honk = new DatabaseAsset("Honk", "InteractionIcons"); - public static DatabaseAsset Nuke = new DatabaseAsset("Nuke", "InteractionIcons"); + public const string Power = "Power"; + public const string Take = "Take"; + public const string Open = "Open"; + public const string Discard = "Discard"; + public const string Honk = "Honk"; + public const string Nuke = "Nuke"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Items.cs b/Assets/Scripts/SS3D/Data/Generated/Items.cs index d77d6d9105..e86339775e 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Items.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Items.cs @@ -1,102 +1,100 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class Items { - public static DatabaseAsset BikeHorn = new DatabaseAsset("BikeHorn", "Items"); - public static DatabaseAsset NuclearAuthenticationDisk = new DatabaseAsset("NuclearAuthenticationDisk", "Items"); - public static DatabaseAsset ToolboxBlue = new DatabaseAsset("ToolboxBlue", "Items"); - public static DatabaseAsset SecurityPDA = new DatabaseAsset("SecurityPDA", "Items"); - public static DatabaseAsset SecurityIDCard = new DatabaseAsset("SecurityIDCard", "Items"); - public static DatabaseAsset PDA = new DatabaseAsset("PDA", "Items"); - public static DatabaseAsset IDCard = new DatabaseAsset("IDCard", "Items"); - public static DatabaseAsset Mug = new DatabaseAsset("Mug", "Items"); - public static DatabaseAsset SodaCanCola = new DatabaseAsset("SodaCanCola", "Items"); - public static DatabaseAsset SodaCanCannedLaughter = new DatabaseAsset("SodaCanCannedLaughter", "Items"); - public static DatabaseAsset SodaCanCannedAir = new DatabaseAsset("SodaCanCannedAir", "Items"); - public static DatabaseAsset SodaCanTonic = new DatabaseAsset("SodaCanTonic", "Items"); - public static DatabaseAsset SodaCanBeepyLime = new DatabaseAsset("SodaCanBeepyLime", "Items"); - public static DatabaseAsset SodaCanBeepsSoda = new DatabaseAsset("SodaCanBeepsSoda", "Items"); - public static DatabaseAsset SodaCanDukePurpleTea = new DatabaseAsset("SodaCanDukePurpleTea", "Items"); - public static DatabaseAsset Poster = new DatabaseAsset("Poster", "Items"); - public static DatabaseAsset MedicalPatch = new DatabaseAsset("MedicalPatch", "Items"); - public static DatabaseAsset BrutePatch = new DatabaseAsset("BrutePatch", "Items"); - public static DatabaseAsset BurnPatch = new DatabaseAsset("BurnPatch", "Items"); - public static DatabaseAsset DonkPocket = new DatabaseAsset("DonkPocket", "Items"); - public static DatabaseAsset Boombox = new DatabaseAsset("Boombox", "Items"); - public static DatabaseAsset FloorTile = new DatabaseAsset("FloorTile", "Items"); - public static DatabaseAsset SteelReinforcedSheet = new DatabaseAsset("SteelReinforcedSheet", "Items"); - public static DatabaseAsset SteelSheet = new DatabaseAsset("SteelSheet", "Items"); - public static DatabaseAsset Crowbar = new DatabaseAsset("Crowbar", "Items"); - public static DatabaseAsset ScrewdriverBlue = new DatabaseAsset("ScrewdriverBlue", "Items"); - public static DatabaseAsset Wrench = new DatabaseAsset("Wrench", "Items"); - public static DatabaseAsset FlashlightBlue = new DatabaseAsset("FlashlightBlue", "Items"); - public static DatabaseAsset KitchenKnife = new DatabaseAsset("KitchenKnife", "Items"); - public static DatabaseAsset TruckerCap = new DatabaseAsset("TruckerCap", "Items"); - public static DatabaseAsset Sunglasses = new DatabaseAsset("Sunglasses", "Items"); - public static DatabaseAsset FacewearGasMask = new DatabaseAsset("FacewearGasMask", "Items"); - public static DatabaseAsset HumanArmLeft = new DatabaseAsset("HumanArmLeft", "Items"); - public static DatabaseAsset HumanArmRight = new DatabaseAsset("HumanArmRight", "Items"); - public static DatabaseAsset HumanEarLeft = new DatabaseAsset("HumanEarLeft", "Items"); - public static DatabaseAsset HumanEarRight = new DatabaseAsset("HumanEarRight", "Items"); - public static DatabaseAsset HumanFootLeft = new DatabaseAsset("HumanFootLeft", "Items"); - public static DatabaseAsset HumanFootRight = new DatabaseAsset("HumanFootRight", "Items"); - public static DatabaseAsset HumanHandLeft = new DatabaseAsset("HumanHandLeft", "Items"); - public static DatabaseAsset HumanHandRight = new DatabaseAsset("HumanHandRight", "Items"); - public static DatabaseAsset HumanHead = new DatabaseAsset("HumanHead", "Items"); - public static DatabaseAsset HumanLegLeft = new DatabaseAsset("HumanLegLeft", "Items"); - public static DatabaseAsset HumanTorso = new DatabaseAsset("HumanTorso", "Items"); - public static DatabaseAsset HumanLegRight = new DatabaseAsset("HumanLegRight", "Items"); - public static DatabaseAsset HumanLungRight = new DatabaseAsset("HumanLungRight", "Items"); - public static DatabaseAsset HumanLungLeft = new DatabaseAsset("HumanLungLeft", "Items"); - public static DatabaseAsset HumanStomach = new DatabaseAsset("HumanStomach", "Items"); - public static DatabaseAsset HumanLiver = new DatabaseAsset("HumanLiver", "Items"); - public static DatabaseAsset HumanIntestineLarge = new DatabaseAsset("HumanIntestineLarge", "Items"); - public static DatabaseAsset HumanEye = new DatabaseAsset("HumanEye", "Items"); - public static DatabaseAsset HumanBrain = new DatabaseAsset("HumanBrain", "Items"); - public static DatabaseAsset Toolbelt = new DatabaseAsset("Toolbelt", "Items"); - public static DatabaseAsset Backpack = new DatabaseAsset("Backpack", "Items"); - public static DatabaseAsset HumanHeart = new DatabaseAsset("HumanHeart", "Items"); - public static DatabaseAsset Doodad = new DatabaseAsset("Doodad", "Items"); - public static DatabaseAsset Wirecutters = new DatabaseAsset("Wirecutters", "Items"); - public static DatabaseAsset Multitool = new DatabaseAsset("Multitool", "Items"); - public static DatabaseAsset PowerCellAdmin = new DatabaseAsset("PowerCellAdmin", "Items"); - public static DatabaseAsset PowerCell = new DatabaseAsset("PowerCell", "Items"); - public static DatabaseAsset SteelWall = new DatabaseAsset("SteelWall", "Items"); - public static DatabaseAsset SteelGirder = new DatabaseAsset("SteelGirder", "Items"); - public static DatabaseAsset Plenum = new DatabaseAsset("Plenum", "Items"); - public static DatabaseAsset SteelGirderUnbolted = new DatabaseAsset("SteelGirderUnbolted", "Items"); - public static DatabaseAsset GlassReinforcedSheet = new DatabaseAsset("GlassReinforcedSheet", "Items"); - public static DatabaseAsset GlassSheet = new DatabaseAsset("GlassSheet", "Items"); - public static DatabaseAsset WoodLog = new DatabaseAsset("WoodLog", "Items"); - public static DatabaseAsset WoodPlank = new DatabaseAsset("WoodPlank", "Items"); - public static DatabaseAsset SteelRod = new DatabaseAsset("SteelRod", "Items"); - public static DatabaseAsset Welder = new DatabaseAsset("Welder", "Items"); - public static DatabaseAsset PlasmaTank = new DatabaseAsset("PlasmaTank", "Items"); - public static DatabaseAsset OxygenTank = new DatabaseAsset("OxygenTank", "Items"); - public static DatabaseAsset JumpsuitGrey = new DatabaseAsset("JumpsuitGrey", "Items"); - public static DatabaseAsset JumpsuitSecurity = new DatabaseAsset("JumpsuitSecurity", "Items"); - public static DatabaseAsset JumpsuitBotany = new DatabaseAsset("JumpsuitBotany", "Items"); - public static DatabaseAsset HumanIntestineSmall = new DatabaseAsset("HumanIntestineSmall", "Items"); - public static DatabaseAsset GlassShard = new DatabaseAsset("GlassShard", "Items"); - public static DatabaseAsset JumpsuitEngineer = new DatabaseAsset("JumpsuitEngineer", "Items"); - public static DatabaseAsset MicroLaser = new DatabaseAsset("MicroLaser", "Items"); - public static DatabaseAsset MatterBin = new DatabaseAsset("MatterBin", "Items"); - public static DatabaseAsset Medkit = new DatabaseAsset("Medkit", "Items"); - public static DatabaseAsset HealthScanner = new DatabaseAsset("HealthScanner", "Items"); - public static DatabaseAsset Hatchet = new DatabaseAsset("Hatchet", "Items"); - public static DatabaseAsset ElectricalWire = new DatabaseAsset("ElectricalWire", "Items"); - public static DatabaseAsset ElectricalCable = new DatabaseAsset("ElectricalCable", "Items"); - public static DatabaseAsset SteelWindow = new DatabaseAsset("SteelWindow", "Items"); - public static DatabaseAsset SteelWallReinforced = new DatabaseAsset("SteelWallReinforced", "Items"); - public static DatabaseAsset SteelWindowReinforced = new DatabaseAsset("SteelWindowReinforced", "Items"); - public static DatabaseAsset HeadsetSecurity = new DatabaseAsset("HeadsetSecurity", "Items"); - public static DatabaseAsset Headset = new DatabaseAsset("Headset", "Items"); - public static DatabaseAsset GloveInsulated = new DatabaseAsset("GloveInsulated", "Items"); - public static DatabaseAsset ShoeHiTops = new DatabaseAsset("ShoeHiTops", "Items"); - public static DatabaseAsset ShoeJackboots = new DatabaseAsset("ShoeJackboots", "Items"); + public const string BikeHorn = "BikeHorn"; + public const string NuclearAuthenticationDisk = "NuclearAuthenticationDisk"; + public const string ToolboxBlue = "ToolboxBlue"; + public const string SecurityPDA = "SecurityPDA"; + public const string SecurityIDCard = "SecurityIDCard"; + public const string PDA = "PDA"; + public const string IDCard = "IDCard"; + public const string Mug = "Mug"; + public const string SodaCanCola = "SodaCanCola"; + public const string SodaCanCannedLaughter = "SodaCanCannedLaughter"; + public const string SodaCanCannedAir = "SodaCanCannedAir"; + public const string SodaCanTonic = "SodaCanTonic"; + public const string SodaCanBeepyLime = "SodaCanBeepyLime"; + public const string SodaCanBeepsSoda = "SodaCanBeepsSoda"; + public const string SodaCanDukePurpleTea = "SodaCanDukePurpleTea"; + public const string Poster = "Poster"; + public const string MedicalPatch = "MedicalPatch"; + public const string BrutePatch = "BrutePatch"; + public const string BurnPatch = "BurnPatch"; + public const string DonkPocket = "DonkPocket"; + public const string Boombox = "Boombox"; + public const string FloorTile = "FloorTile"; + public const string SteelReinforcedSheet = "SteelReinforcedSheet"; + public const string SteelSheet = "SteelSheet"; + public const string Crowbar = "Crowbar"; + public const string ScrewdriverBlue = "ScrewdriverBlue"; + public const string Wrench = "Wrench"; + public const string FlashlightBlue = "FlashlightBlue"; + public const string KitchenKnife = "KitchenKnife"; + public const string TruckerCap = "TruckerCap"; + public const string Sunglasses = "Sunglasses"; + public const string FacewearGasMask = "FacewearGasMask"; + public const string HumanArmLeft = "HumanArmLeft"; + public const string HumanArmRight = "HumanArmRight"; + public const string HumanEarLeft = "HumanEarLeft"; + public const string HumanEarRight = "HumanEarRight"; + public const string HumanFootLeft = "HumanFootLeft"; + public const string HumanFootRight = "HumanFootRight"; + public const string HumanHandLeft = "HumanHandLeft"; + public const string HumanHandRight = "HumanHandRight"; + public const string HumanHead = "HumanHead"; + public const string HumanLegLeft = "HumanLegLeft"; + public const string HumanTorso = "HumanTorso"; + public const string HumanLegRight = "HumanLegRight"; + public const string HumanLungRight = "HumanLungRight"; + public const string HumanLungLeft = "HumanLungLeft"; + public const string HumanStomach = "HumanStomach"; + public const string HumanLiver = "HumanLiver"; + public const string HumanIntestineLarge = "HumanIntestineLarge"; + public const string HumanEye = "HumanEye"; + public const string HumanBrain = "HumanBrain"; + public const string Toolbelt = "Toolbelt"; + public const string Backpack = "Backpack"; + public const string HumanHeart = "HumanHeart"; + public const string Doodad = "Doodad"; + public const string Wirecutters = "Wirecutters"; + public const string Multitool = "Multitool"; + public const string PowerCellAdmin = "PowerCellAdmin"; + public const string PowerCell = "PowerCell"; + public const string SteelWall = "SteelWall"; + public const string SteelGirder = "SteelGirder"; + public const string Plenum = "Plenum"; + public const string SteelGirderUnbolted = "SteelGirderUnbolted"; + public const string GlassReinforcedSheet = "GlassReinforcedSheet"; + public const string GlassSheet = "GlassSheet"; + public const string WoodLog = "WoodLog"; + public const string WoodPlank = "WoodPlank"; + public const string SteelRod = "SteelRod"; + public const string Welder = "Welder"; + public const string PlasmaTank = "PlasmaTank"; + public const string OxygenTank = "OxygenTank"; + public const string JumpsuitGrey = "JumpsuitGrey"; + public const string JumpsuitSecurity = "JumpsuitSecurity"; + public const string JumpsuitBotany = "JumpsuitBotany"; + public const string HumanIntestineSmall = "HumanIntestineSmall"; + public const string GlassShard = "GlassShard"; + public const string JumpsuitEngineer = "JumpsuitEngineer"; + public const string MicroLaser = "MicroLaser"; + public const string MatterBin = "MatterBin"; + public const string Medkit = "Medkit"; + public const string HealthScanner = "HealthScanner"; + public const string Hatchet = "Hatchet"; + public const string ElectricalWire = "ElectricalWire"; + public const string ElectricalCable = "ElectricalCable"; + public const string SteelWindow = "SteelWindow"; + public const string SteelWallReinforced = "SteelWallReinforced"; + public const string SteelWindowReinforced = "SteelWindowReinforced"; + public const string HeadsetSecurity = "HeadsetSecurity"; + public const string Headset = "Headset"; + public const string GloveInsulated = "GloveInsulated"; + public const string ShoeHiTops = "ShoeHiTops"; + public const string ShoeJackboots = "ShoeJackboots"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Materials.cs b/Assets/Scripts/SS3D/Data/Generated/Materials.cs index 801b843115..4d333ea351 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Materials.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Materials.cs @@ -1,13 +1,11 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class Materials { - public static DatabaseAsset DeleteConstruction = new DatabaseAsset("DeleteConstruction", "Materials"); - public static DatabaseAsset InvalidConstruction = new DatabaseAsset("InvalidConstruction", "Materials"); - public static DatabaseAsset ValidConstruction = new DatabaseAsset("ValidConstruction", "Materials"); + public const string DeleteConstruction = "DeleteConstruction"; + public const string InvalidConstruction = "InvalidConstruction"; + public const string ValidConstruction = "ValidConstruction"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs b/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs index f0d26c0901..67c8c6e970 100644 --- a/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs +++ b/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs @@ -1,13 +1,11 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class ParticlesEffects { - public static DatabaseAsset AttackParticles = new DatabaseAsset("AttackParticles", "ParticlesEffects"); - public static DatabaseAsset BleedingParticle = new DatabaseAsset("BleedingParticle", "ParticlesEffects"); - public static DatabaseAsset ConstructionParticle = new DatabaseAsset("ConstructionParticle", "ParticlesEffects"); + public const string AttackParticles = "AttackParticles"; + public const string BleedingParticle = "BleedingParticle"; + public const string ConstructionParticle = "ConstructionParticle"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Sounds.cs b/Assets/Scripts/SS3D/Data/Generated/Sounds.cs index df768b20f8..215805f6c6 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Sounds.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Sounds.cs @@ -1,21 +1,19 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class Sounds { - public static DatabaseAsset BikeHorn = new DatabaseAsset("BikeHorn", "Sounds"); - public static DatabaseAsset Title1 = new DatabaseAsset("Title1", "Sounds"); - public static DatabaseAsset Title2 = new DatabaseAsset("Title2", "Sounds"); - public static DatabaseAsset Title3 = new DatabaseAsset("Title3", "Sounds"); - public static DatabaseAsset Can1 = new DatabaseAsset("Can1", "Sounds"); - public static DatabaseAsset Can2 = new DatabaseAsset("Can2", "Sounds"); - public static DatabaseAsset Can3 = new DatabaseAsset("Can3", "Sounds"); - public static DatabaseAsset Can4 = new DatabaseAsset("Can4", "Sounds"); - public static DatabaseAsset AirlockClose = new DatabaseAsset("AirlockClose", "Sounds"); - public static DatabaseAsset AirlockOpen = new DatabaseAsset("AirlockOpen", "Sounds"); - public static DatabaseAsset FuelPowerGenerator = new DatabaseAsset("FuelPowerGenerator", "Sounds"); + public const string BikeHorn = "BikeHorn"; + public const string Title1 = "Title1"; + public const string Title2 = "Title2"; + public const string Title3 = "Title3"; + public const string Can1 = "Can1"; + public const string Can2 = "Can2"; + public const string Can3 = "Can3"; + public const string Can4 = "Can4"; + public const string AirlockClose = "AirlockClose"; + public const string AirlockOpen = "AirlockOpen"; + public const string FuelPowerGenerator = "FuelPowerGenerator"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs b/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs index 2aab27c614..b7ee1ba58d 100644 --- a/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs +++ b/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs @@ -1,11 +1,9 @@ -using SS3D.Data.AssetDatabases -; namespace SS3D.Data.Generated { // This class is autogenerated. Do not modify manually. public static class WorldSpaceUI { - public static DatabaseAsset LoadingBar = new DatabaseAsset("LoadingBar", "WorldSpaceUI"); + public const string LoadingBar = "LoadingBar"; } } From dc30b74c41b4eece2b41dbc209b304a86cc8f8e7 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:36:33 -0500 Subject: [PATCH 22/54] Refactor asset retrieval in interactions and components to use Assets.Get method instead of DatabaseAsset's Prefab property, Create, Get() & CreateAs(...) functions, and different implicit operators. --- .../WorldObjectAssetReference.cs | 11 +++---- .../Interactions/ClientDelayedInteraction.cs | 6 ++-- .../Combat/Interactions/HitInteraction.cs | 5 +-- .../SS3D/Systems/Crafting/CraftingRecipe.cs | 2 +- .../Systems/Crafting/CraftingSubSystem.cs | 6 ++-- .../Systems/Electricity/FuelPowerGenerator.cs | 5 +-- .../Systems/Furniture/AirlockStateMachine.cs | 8 +++-- .../Furniture/DispenseProductInteraction.cs | 6 ++-- .../SS3D/Systems/Furniture/DragInteraction.cs | 5 +-- .../Furniture/LockLockerInteraction.cs | 6 ++-- .../Furniture/LockerDoorInteraction.cs | 5 +-- Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs | 4 ++- .../Furniture/UnlockLockerInteraction.cs | 5 +-- .../SS3D/Systems/Furniture/VendingMachine.cs | 28 +++++++++++------ .../SS3D/Systems/Health/BleedingBodyPart.cs | 3 +- .../Systems/Health/BodyParts/HeadBodyPart.cs | 9 +++--- .../Systems/Health/BodyParts/HumanTorso.cs | 31 ++++++++----------- .../Commands/AddHandCommand.cs | 14 ++++----- .../Containers/ContainerInteractive.cs | 21 ++++++++----- .../Inventory/Interactions/DropInteraction.cs | 5 +-- .../Inventory/Interactions/OpenInteraction.cs | 5 +-- .../Interactions/PickupInteraction.cs | 5 +-- .../Interactions/StoreInteraction.cs | 5 +-- .../Interactions/TakeFirstInteraction.cs | 5 +-- .../Interactions/ViewContainerInteraction.cs | 5 +-- .../Inventory/Items/Generic/BikeHorn.cs | 5 +-- .../Items/Generic/HonkInteraction.cs | 5 +-- .../Items/Generic/NukeDetonateInteraction.cs | 3 +- .../Systems/Inventory/Items/ItemSubSystem.cs | 13 ++++---- .../TileMapCreator/ConstructionHologram.cs | 15 ++++++--- .../PlayMode/Framework/Helpers/TestHelpers.cs | 2 +- 31 files changed, 142 insertions(+), 111 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index e37d02e615..b4586b67cc 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -14,19 +14,16 @@ public sealed class WorldObjectAssetReference : ScriptableObject /// The prefab of this asset reference. Here for quick access. /// [CanBeNull] - public GameObject Prefab => Asset.Get(); - - /// - /// Short access to the database asset. - /// - public DatabaseAsset Asset => new DatabaseAsset(Id, Database); + public GameObject Prefab => Assets.Get(Database, Id); /// /// Short access to the Assets.Get function. /// /// /// - public T Get() where T : Object => Asset.Get(); + [CanBeNull] + public T Get() + where T : Object => Assets.Get(Database, Id); #if UNITY_EDITOR [ReadOnly] diff --git a/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs b/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs index 1e6bd52870..619c9944b1 100644 --- a/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs +++ b/Assets/Scripts/SS3D/Interactions/ClientDelayedInteraction.cs @@ -1,5 +1,4 @@ using Coimbra; -using Serilog; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; using UnityEngine; @@ -38,8 +37,9 @@ public bool ClientStart(InteractionEvent interactionEvent) { return true; } - - WorldSpaceUI.LoadingBar.CreateAs(out _loadingBarInstance, source.GameObject.transform); + + LoadingBar loadingBarPrefab = Assets.Get(AssetDatabases.WorldSpaceUI, WorldSpaceUI.LoadingBar); + _loadingBarInstance = Object.Instantiate(loadingBarPrefab, source.GameObject.transform); _loadingBarInstance.LocalPosition = LoadingBarOffset; _loadingBarInstance.Duration = Delay; diff --git a/Assets/Scripts/SS3D/Systems/Combat/Interactions/HitInteraction.cs b/Assets/Scripts/SS3D/Systems/Combat/Interactions/HitInteraction.cs index 395e39bea2..c4229a9134 100644 --- a/Assets/Scripts/SS3D/Systems/Combat/Interactions/HitInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Combat/Interactions/HitInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Interactions; +using SS3D.Data; +using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; using UnityEngine; @@ -22,7 +23,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Nuke; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Nuke); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs index 26d6c78bba..846984459b 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs @@ -25,7 +25,7 @@ public class CraftingRecipe : ScriptableObject /// /// First step of the recipe, which should have the same name as the target of the recipe. /// - public string RootStepName => Target.Prefab.name; + public string RootStepName => Target?.Get()?.name; public bool HasInitial => Steps.Any(x => x.IsInitialState); diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs index 56c2bc98c6..5fe7a64f1b 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs @@ -1,5 +1,4 @@ using Coimbra; -using Cysharp.Threading.Tasks; using FishNet; using FishNet.Object; using JetBrains.Annotations; @@ -15,7 +14,6 @@ using SS3D.Systems.Entities.Humanoid; using SS3D.Systems.Inventory.Items; using SS3D.Systems.Tile; -using System.Collections; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -601,8 +599,8 @@ private bool ItemTargetIsValid(InteractionEvent interactionEvent, Item target) [ObserversRpc] private void AddCraftingSmoke(GameObject target, int referenceId) { - GameObject particleGameObject = Instantiate(ParticlesEffects.ConstructionParticle.Prefab, target.transform.position, Quaternion.identity); - ParticleSystem particles = particleGameObject.GetComponent(); + ParticleSystem particlePrefab = Assets.Get(AssetDatabases.ParticlesEffects, ParticlesEffects.ConstructionParticle); + ParticleSystem particles = Instantiate(particlePrefab, target.transform.position, Quaternion.identity); // Get the shape module of the dust cloud particle system ParticleSystem.ShapeModule shapeModule = particles.shape; diff --git a/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs b/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs index 9213ce4428..1b7e3ad9d3 100644 --- a/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs +++ b/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs @@ -1,6 +1,7 @@ using FishNet.Object; using FishNet.Object.Synchronizing; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Systems.Audio; @@ -61,8 +62,8 @@ private void HandleSound(bool isEnabled) } else { - SubSystems.Get().PlayAudioSource(AudioType.Music, Sounds.FuelPowerGenerator, Position, NetworkObject, - true, 0.7f, 1, 1, 10); + AudioClip fuelPowerGeneratorClip = Assets.Get(AssetDatabases.Sounds, Sounds.FuelPowerGenerator); + SubSystems.Get().PlayAudioSource(AudioType.Music, fuelPowerGeneratorClip, Position, NetworkObject, true, 0.7f, 1, 1, 10); } } diff --git a/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs b/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs index bccf7e0a55..60f8695684 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs @@ -1,5 +1,6 @@ using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Systems.Audio; using UnityEngine; @@ -32,12 +33,15 @@ public override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo if (stateInfo.IsName(Opening)) { ChangeColors(_openingColor, animator); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.AirlockOpen, animator.GetComponent()); + AudioClip airlockOpenClip = Assets.Get(AssetDatabases.Sounds, Sounds.AirlockOpen); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, airlockOpenClip, animator.GetComponent()); } + if (stateInfo.IsName(Closing)) { ChangeColors(_closingColor, animator); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.AirlockClose, animator.GetComponent()); + AudioClip airlockCloseClip = Assets.Get(AssetDatabases.Sounds, Sounds.AirlockClose); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, airlockCloseClip, animator.GetComponent()); } } diff --git a/Assets/Scripts/SS3D/Systems/Furniture/DispenseProductInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/DispenseProductInteraction.cs index b22f095285..66e2c00b1b 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/DispenseProductInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/DispenseProductInteraction.cs @@ -1,8 +1,8 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; -using SS3D.Systems.Tile; using UnityEngine; namespace SS3D.Systems.Furniture @@ -39,7 +39,7 @@ public override bool CanInteract(InteractionEvent interactionEvent) /// public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Take; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); } /// diff --git a/Assets/Scripts/SS3D/Systems/Furniture/DragInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/DragInteraction.cs index 31b80dd77b..f615073542 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/DragInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/DragInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Systems.Entities; @@ -31,7 +32,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return InteractionIcons.Discard; + return Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Discard); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs index 80b51a5b31..c9c830da19 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs @@ -1,11 +1,11 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; using SS3D.Logging; using SS3D.Systems.Furniture; using SS3D.Systems.Inventory.Containers; -using System; using UnityEngine; namespace SS3D.Systems.Inventory.Interactions @@ -28,7 +28,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs index 25e3ec547a..23b832ab29 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using UnityEngine; @@ -21,7 +22,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs b/Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs index 2155866ba2..145d01f3cb 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/Nuke.cs @@ -2,9 +2,11 @@ using SS3D.Interactions.Interfaces; using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Systems.Gamemodes; using SS3D.Systems.Inventory.Items.Generic; +using UnityEngine; namespace SS3D.Systems.Furniture { @@ -19,7 +21,7 @@ public void Detonate() IInteraction[] IInteractionTarget.CreateTargetInteractions(InteractionEvent interactionEvent) { - return new IInteraction[] { new NukeDetonateInteraction { Icon = InteractionIcons.Nuke } }; + return new IInteraction[] { new NukeDetonateInteraction { Icon = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Nuke) } }; } } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs index 0da1cbf769..b8e256f235 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; @@ -29,7 +30,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs index 2ce313c56b..efed611d73 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs @@ -1,5 +1,6 @@ using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Interfaces; @@ -55,33 +56,38 @@ public void DispenseProduct(int productIndex) { return; } - + if (productIndex >= _productsToDispense.Length) { - Log.Error(this, $"Product with index {productIndex} not found in products to dispense in {gameObject.name}. " - + $"Max possible index is {_productsToDispense.Length - 1}"); + Log.Error(this, $"Product with index {productIndex} not found in products to dispense in {gameObject.name}. Max possible index is {_productsToDispense.Length - 1}"); + return; } - + if (productIndex < 0) { Log.Error(this, $"Invalid product index, value must be between 0 and {_productsToDispense.Length - 1}"); + return; } VendingMachineProductStock productToDispenseStock = _productsToDispense[productIndex]; + AudioSubSystem audioSubSystem = SubSystems.Get(); + if (productToDispenseStock.Stock <= 0) { - SubSystems.Get().PlayAudioSource(Audio.AudioType.Sfx, Sounds.BikeHorn, Position, NetworkObject, - false, 0.7f, 1, 1, 3); + AudioClip bikeHornClip = Assets.Get(AssetDatabases.Sounds, Sounds.BikeHorn); + audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, bikeHornClip, Position, NetworkObject, false, 0.7f, 1, 1, 3); + return; } _powerConsumer.UseMachineOnce(); productToDispenseStock.Stock--; - SubSystems.Get().PlayAudioSource(Audio.AudioType.Sfx, Sounds.Can1, Position, NetworkObject, - false, 0.7f, 1, 1, 3); - + + AudioClip can1Clip = Assets.Get(AssetDatabases.Sounds, Sounds.Can1); + audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, can1Clip, Position, NetworkObject, false, 0.7f, 1, 1, 3); + ItemSubSystem itemSystem = SubSystems.Get(); Quaternion quaternion = Quaternion.Euler(new Vector3(Random.Range(0, 360), Random.Range(0, 360), Random.Range(0, 360))); @@ -95,6 +101,8 @@ public IInteraction[] CreateTargetInteractions(InteractionEvent interactionEvent { return Array.Empty(); } + + Sprite takeIcon = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); IInteraction[] interactions = new IInteraction[_productsToDispense.Length]; for (int i = 0; i < _productsToDispense.Length; i++) @@ -104,7 +112,7 @@ public IInteraction[] CreateTargetInteractions(InteractionEvent interactionEvent ProductName = _productsToDispense[i].Product.NameString, ProductIndex = i, ProductStock = _productsToDispense[i].Stock, - Icon = InteractionIcons.Take + Icon = takeIcon, }; } diff --git a/Assets/Scripts/SS3D/Systems/Health/BleedingBodyPart.cs b/Assets/Scripts/SS3D/Systems/Health/BleedingBodyPart.cs index 8d22bc0848..50c2631a7c 100644 --- a/Assets/Scripts/SS3D/Systems/Health/BleedingBodyPart.cs +++ b/Assets/Scripts/SS3D/Systems/Health/BleedingBodyPart.cs @@ -2,6 +2,7 @@ using FishNet.Object.Synchronizing; using UnityEngine; using Coimbra; +using SS3D.Data; using SS3D.Data.Generated; using System; @@ -43,7 +44,7 @@ public void SyncBleedEffect(bool prev, bool next, bool asServer) if (next && _bloodEffect == null) { - GameObject bleedingEffect = ParticlesEffects.BleedingParticle; + GameObject bleedingEffect = Assets.Get(AssetDatabases.ParticlesEffects, ParticlesEffects.BleedingParticle); GameObject bloodDisplayer; Transform bloodParent; if (_bodyPart.BodyCollider != null) diff --git a/Assets/Scripts/SS3D/Systems/Health/BodyParts/HeadBodyPart.cs b/Assets/Scripts/SS3D/Systems/Health/BodyParts/HeadBodyPart.cs index 6270187a4f..1b2bf1e559 100644 --- a/Assets/Scripts/SS3D/Systems/Health/BodyParts/HeadBodyPart.cs +++ b/Assets/Scripts/SS3D/Systems/Health/BodyParts/HeadBodyPart.cs @@ -1,10 +1,10 @@ using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Systems.Entities; using SS3D.Systems.Entities.Humanoid; using System.Collections; -using UnityEngine; using UnityEngine.Serialization; namespace SS3D.Systems.Health @@ -79,11 +79,10 @@ protected override void BeforeDestroyingBodyPart() protected override void SpawnOrgans() { - GameObject brainPrefab = Items.HumanBrain; - GameObject brainGameObject = Instantiate(brainPrefab); - Brain = brainGameObject.GetComponent(); + Brain brainPrefab = Assets.Get(AssetDatabases.Items, Items.HumanBrain); + Brain = Instantiate(brainPrefab); Brain.HealthController = HealthController; - Spawn(brainGameObject, Owner); + Spawn(Brain.GameObject, Owner); } } } diff --git a/Assets/Scripts/SS3D/Systems/Health/BodyParts/HumanTorso.cs b/Assets/Scripts/SS3D/Systems/Health/BodyParts/HumanTorso.cs index 9c3d008b16..6a40abd4a7 100644 --- a/Assets/Scripts/SS3D/Systems/Health/BodyParts/HumanTorso.cs +++ b/Assets/Scripts/SS3D/Systems/Health/BodyParts/HumanTorso.cs @@ -1,8 +1,7 @@ -using SS3D.Data.Generated; -using SS3D.Systems.Entities; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Systems.Health; using System.Collections; -using UnityEngine; public class HumanTorso : BodyPart { @@ -33,21 +32,17 @@ private IEnumerator AddInternalOrgans() protected override void SpawnOrgans() { - GameObject heartPrefab = Items.HumanHeart; - GameObject leftLungPrefab = Items.HumanLungLeft; - GameObject rightLungPrefab = Items.HumanLungRight;; - - GameObject heartGameObject = Instantiate(heartPrefab); - GameObject leftLungGameObject = Instantiate(leftLungPrefab); - GameObject rightLungGameObject = Instantiate(rightLungPrefab); - - Heart = heartGameObject.GetComponent(); - LeftLung = leftLungGameObject.GetComponent(); - RightLung = rightLungGameObject.gameObject.GetComponent(); - - Spawn(heartGameObject, Owner); - Spawn(leftLungGameObject, Owner); - Spawn(rightLungGameObject, Owner); + Heart heartPrefab = Assets.Get(AssetDatabases.Items, Items.HumanHeart); + Lungs leftLungPrefab = Assets.Get(AssetDatabases.Items, Items.HumanLungLeft); + Lungs rightLungPrefab = Assets.Get(AssetDatabases.Items, Items.HumanLungRight); + + Heart = Instantiate(heartPrefab); + LeftLung = Instantiate(leftLungPrefab); + RightLung = Instantiate(rightLungPrefab); + + Spawn(Heart.GameObject, Owner); + Spawn(LeftLung.GameObject, Owner); + Spawn(RightLung.GameObject, Owner); } protected override void AddInitialLayers() diff --git a/Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHandCommand.cs b/Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHandCommand.cs index 548ce6a427..e662e37190 100644 --- a/Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHandCommand.cs +++ b/Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHandCommand.cs @@ -5,6 +5,7 @@ using FishNet; using SS3D.Systems.Inventory.Containers; using FishNet.Connection; +using SS3D.Data; using SS3D.Permissions; using SS3D.Data.Generated; @@ -43,17 +44,16 @@ public override string Perform(string[] args, NetworkConnection conn) Player Player = SubSystems.Get().GetPlayer(ckey); Entity entity = SubSystems.Get().GetSpawnedEntity(Player); - GameObject leftHandPrefab = Items.HumanHandLeft; - GameObject leftHandObject = GameObject.Instantiate(leftHandPrefab, entity.transform); - leftHandObject.transform.localPosition = position; - leftHandObject.transform.localEulerAngles = rotation; + Hand leftHandPrefab = Assets.Get(AssetDatabases.Items, Items.HumanHandLeft); + Hand leftHand = Object.Instantiate(leftHandPrefab, entity.transform); + leftHand.Transform.localPosition = position; + leftHand.Transform.localEulerAngles = rotation; - Hand leftHand = leftHandObject.GetComponent(); - InstanceFinder.ServerManager.Spawn(leftHandObject, Player.Owner); + InstanceFinder.ServerManager.Spawn(leftHand.GameObject, Player.Owner); Hands hands = entity.GetComponent(); HumanInventory inventory = entity.GetComponent(); - inventory.TryAddContainer(leftHandObject.GetComponent()); + inventory.TryAddContainer(leftHand.GetComponent()); hands.AddHand(leftHand); return "hand added"; diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Containers/ContainerInteractive.cs b/Assets/Scripts/SS3D/Systems/Inventory/Containers/ContainerInteractive.cs index 948c090ee5..935606060d 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Containers/ContainerInteractive.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Containers/ContainerInteractive.cs @@ -1,4 +1,5 @@ -using System; +using SS3D.Data; +using System; using System.Collections.Generic; using SS3D.Interactions; using SS3D.Interactions.Interfaces; @@ -28,20 +29,25 @@ public override IInteraction[] CreateTargetInteractions(InteractionEvent interac List interactions = new(); + Sprite takeIcon = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); + Sprite openIcon = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); + StoreInteraction storeInteraction = new(attachedContainer) { - Icon = InteractionIcons.Take - }; + Icon = takeIcon, + }; + TakeFirstInteraction takeFirstInteraction = new(attachedContainer) { - Icon = InteractionIcons.Take + Icon = takeIcon, }; + ViewContainerInteraction view = new(attachedContainer) { - MaxDistance = attachedContainer.MaxDistance, Icon = _viewContainerIcon + MaxDistance = attachedContainer.MaxDistance, Icon = _viewContainerIcon, }; - view.Icon = InteractionIcons.Open; + view.Icon = openIcon; // Pile or Normal the Store Interaction will always appear, but View only appears in Normal containers if (IsOpen() | !attachedContainer.OnlyStoreWhenOpen | !attachedContainer.IsOpenable) @@ -65,8 +71,9 @@ public override IInteraction[] CreateTargetInteractions(InteractionEvent interac OpenInteraction openInteraction = new(attachedContainer) { - Icon = InteractionIcons.Open + Icon = openIcon, }; + openInteraction.OnOpenStateChanged += OpenStateChanged; interactions.Add(openInteraction); diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/DropInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/DropInteraction.cs index 7b30f8def5..9fb378d703 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/DropInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/DropInteraction.cs @@ -1,4 +1,5 @@ -using System; +using SS3D.Data; +using System; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; @@ -29,7 +30,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon ? Icon : InteractionIcons.Discard; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Discard); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/OpenInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/OpenInteraction.cs index 9f3e16cd9a..2f7a78c1cc 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/OpenInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/OpenInteraction.cs @@ -1,4 +1,5 @@ -using System; +using SS3D.Data; +using System; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; @@ -40,7 +41,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs index 8cffaf0b5d..2b06d30313 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Interactions; +using SS3D.Data; +using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; using SS3D.Systems.GameModes.Events; @@ -21,7 +22,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Take; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/StoreInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/StoreInteraction.cs index 98868b100b..ff833c2fb2 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/StoreInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/StoreInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; @@ -24,7 +25,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Discard; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Discard); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/TakeFirstInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/TakeFirstInteraction.cs index c818359b6a..f1289f8c6d 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/TakeFirstInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/TakeFirstInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Systems.Inventory.Containers; @@ -25,7 +26,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Take; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/ViewContainerInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/ViewContainerInteraction.cs index a2ae57681b..c3904a946a 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/ViewContainerInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/ViewContainerInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Systems.Entities; @@ -25,7 +26,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Open; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Open); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs index dabca2d112..9ebfb69273 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Interfaces; @@ -25,8 +26,8 @@ public class BikeHorn : Item public void Honk() { _animator.SetTrigger(HonkAnimation); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.BikeHorn, GameObject.transform.position, NetworkObject, - false,0.7f, 1, 1, 5); + AudioClip bikeHornClip = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, bikeHornClip, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } public bool IsHonking() diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/HonkInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/HonkInteraction.cs index 98be8c7f91..8014ef11ae 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/HonkInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/HonkInteraction.cs @@ -1,4 +1,5 @@ -using SS3D.Data.Generated; +using SS3D.Data; +using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; using SS3D.Interactions.Interfaces; @@ -19,7 +20,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Honk; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Honk); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/NukeDetonateInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/NukeDetonateInteraction.cs index b09f8a900f..1d39f59c30 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/NukeDetonateInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/NukeDetonateInteraction.cs @@ -1,4 +1,5 @@ using SS3D.Core; +using SS3D.Data; using SS3D.Data.Generated; using SS3D.Interactions; using SS3D.Interactions.Extensions; @@ -23,7 +24,7 @@ public override string GetName(InteractionEvent interactionEvent) public override Sprite GetIcon(InteractionEvent interactionEvent) { - return Icon != null ? Icon : InteractionIcons.Nuke; + return Icon ? Icon : Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Nuke); } public override bool CanInteract(InteractionEvent interactionEvent) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSubSystem.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSubSystem.cs index d86c7385e1..84135067b0 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/ItemSubSystem.cs @@ -37,7 +37,7 @@ public void CmdSpawnItem(string id, Vector3 position, Quaternion rotation) [Server] public Item SpawnItem(string id, Vector3 position, Quaternion rotation) { - Item itemPrefab = Assets.Get(AssetDatabases.Items, id).GetComponent(); + Item itemPrefab = Assets.Get(AssetDatabases.Items, id); Item itemInstance = Instantiate(itemPrefab, position, rotation); ServerManager.Spawn(itemInstance.GameObject); @@ -69,15 +69,16 @@ public void CmdSpawnItemInContainer(Item id, AttachedContainer attachedContainer [Server] public Item SpawnItemInContainer(string id, AttachedContainer attachedContainer) { - Item itemPrefab = Assets.Get(AssetDatabases.Items, id).GetComponent(); + Item itemPrefab = Assets.Get(AssetDatabases.Items, id); - if (attachedContainer is null) + if (attachedContainer is not null && itemPrefab is not null) { - Log.Error(this, "Container does not found!", Logs.ServerOnly); - return null; + return SpawnItemInContainer(itemPrefab.GameObject, attachedContainer); } - return SpawnItemInContainer(itemPrefab.GameObject, attachedContainer); + Log.Error(this, "Container does not found!", Logs.ServerOnly); + return null; + } // diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologram.cs b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologram.cs index bfb291fd64..cacf91b4df 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologram.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologram.cs @@ -3,9 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using SS3D.Core.Behaviours; -using Coimbra; -using Actor = SS3D.Core.Behaviours.Actor; +using SS3D.Data; namespace SS3D.Systems.Tile.TileMapCreator { @@ -63,14 +61,21 @@ public ConstructionHologram(GameObject ghostObject, Vector3 targetPosition, Dire /// public void ChangeHologramColor(ConstructionMode mode) { - Material ghostMat = mode switch + Material ghostMat = null; + + string ghostMatName = mode switch { ConstructionMode.Valid => Materials.ValidConstruction, ConstructionMode.Invalid => Materials.InvalidConstruction, ConstructionMode.Delete => Materials.DeleteConstruction, - _ => null + _ => null, }; + if (ghostMatName != null) + { + ghostMat = Assets.Get(AssetDatabases.Materials, ghostMatName); + } + foreach (MeshRenderer mr in Hologram.GetComponentsInChildren()) { Material[] materials = mr.materials; diff --git a/Assets/Scripts/Tests/PlayMode/Framework/Helpers/TestHelpers.cs b/Assets/Scripts/Tests/PlayMode/Framework/Helpers/TestHelpers.cs index 38a31d9b4d..0608c87716 100644 --- a/Assets/Scripts/Tests/PlayMode/Framework/Helpers/TestHelpers.cs +++ b/Assets/Scripts/Tests/PlayMode/Framework/Helpers/TestHelpers.cs @@ -192,7 +192,7 @@ public static AttachedContainer LocalPlayerSpawnItemInFirstHandAvailable(string foreach (Hand hand in inventory.Hands.PlayerHands.Where(hand => hand.Container.Empty)) { - Item itemToSpawn = Assets.Get(AssetDatabases.Items, item).GetComponent(); + Item itemToSpawn = Assets.Get(AssetDatabases.Items, item)?.GetComponent(); itemSystem.CmdSpawnItemInContainer(itemToSpawn, hand.Container); From 226c07c4f40e748d49385fa602d9d05c300c6cb2 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:37:37 -0500 Subject: [PATCH 23/54] Removed the now unused class DatabaseAsset.cs --- .../SS3D/Data/AssetDatabases/DatabaseAsset.cs | 98 ------------------- .../Data/AssetDatabases/DatabaseAsset.cs.meta | 3 - 2 files changed, 101 deletions(-) delete mode 100644 Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs delete mode 100644 Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs.meta diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs deleted file mode 100644 index 80fb8402cb..0000000000 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs +++ /dev/null @@ -1,98 +0,0 @@ -using SS3D.Logging.LogSettings; -using UnityEngine; - -namespace SS3D.Data.AssetDatabases -{ - /// - /// Represents an asset data asset, contains the name of the asset and the related database. - /// - /// NOTE: The implicit operators have to be manually added for now. - /// - public sealed class DatabaseAsset - { - /// - /// The name of the asset. - /// - public readonly string Name; - - /// - /// The database this asset belongs to. - /// - public readonly string DatabaseName; - - /// - /// Returns the prefab of this asset as a GameObject. - /// - public GameObject Prefab => Get(); - - /// - /// Instantiates a new GameObject of this asset's prefab - /// - public GameObject Create(Transform parent = null) => GameObject.Instantiate(Prefab, parent); - - /// - /// Instantiates a new GameObject of this asset's prefab and gets a component in its main object. - /// - public GameObject CreateAs(out T component, Transform parent = null) - where T : class - { - GameObject gameObject = GameObject.Instantiate(Prefab, parent); - - component = gameObject.GetComponent(typeof(T)) as T; - - return gameObject; - } - - /// - /// This constructor specifies which databaseID to use and which asset ID, or name, to use. - /// - /// This is used by the AssetData system and is automated, you don't need to create an DatabaseAsset manually. - /// - public DatabaseAsset(string name, string databaseName) - { - Name = name; - DatabaseName = databaseName; - } - - /// - /// Gets this asset as T. - /// - /// The type to cast the asset to. - /// The casted asset. - public T Get() - where T : Object - { - return Assets.Get(DatabaseName, Name); - } - - public static implicit operator string(DatabaseAsset asset) - { - return asset.Name; - } - - public static implicit operator GameObject(DatabaseAsset asset) - { - return asset.Get(); - } - - public static implicit operator Sprite(DatabaseAsset asset) - { - return asset.Get(); - } - - public static implicit operator LogSettings(DatabaseAsset asset) - { - return asset.Get(); - } - - public static implicit operator Material(DatabaseAsset asset) - { - return asset.Get(); - } - - public static implicit operator AudioClip(DatabaseAsset asset) - { - return asset.Get(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs.meta b/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs.meta deleted file mode 100644 index c1b0a2ab0d..0000000000 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/DatabaseAsset.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 00f88e8cc7e84ebbb3dff19c7aaf199f -timeCreated: 1695825631 \ No newline at end of file From 2392b06480b43b3678d90ea64da7269e6191c0a3 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 27 Jan 2026 16:38:47 -0500 Subject: [PATCH 24/54] Rename DatabaseAssetCreator and DatabaseAssetWriter to DatabaseScriptCreator and DatabaseScriptWriter for consistency in asset management workflow. --- .../{DatabaseAssetCreator.cs => DatabaseScriptCreator.cs} | 4 ++-- ...baseAssetCreator.cs.meta => DatabaseScriptCreator.cs.meta} | 0 .../{DatabaseAssetWriter.cs => DatabaseScriptWriter.cs} | 2 +- ...tabaseAssetWriter.cs.meta => DatabaseScriptWriter.cs.meta} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename Assets/Scripts/SS3D/CodeGeneration/Creators/{DatabaseAssetCreator.cs => DatabaseScriptCreator.cs} (90%) rename Assets/Scripts/SS3D/CodeGeneration/Creators/{DatabaseAssetCreator.cs.meta => DatabaseScriptCreator.cs.meta} (100%) rename Assets/Scripts/SS3D/CodeGeneration/Writers/{DatabaseAssetWriter.cs => DatabaseScriptWriter.cs} (97%) rename Assets/Scripts/SS3D/CodeGeneration/Writers/{DatabaseAssetWriter.cs.meta => DatabaseScriptWriter.cs.meta} (100%) diff --git a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs similarity index 90% rename from Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs rename to Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs index 620fff1e12..f0674e7387 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs @@ -8,7 +8,7 @@ namespace SS3D.CodeGeneration.Creators { - public static class DatabaseAssetCreator + public static class DatabaseScriptCreator { #if UNITY_EDITOR /// @@ -26,7 +26,7 @@ public static void CreateAtPath(string path, string className, [NotNull] IEnumer Directory.CreateDirectory(fullPath); } - DatabaseAssetWriter.Write(fullPath, className, enums, namespaceName); + DatabaseScriptWriter.Write(fullPath, className, enums, namespaceName); if (EditorWindow.focusedWindow != null) { diff --git a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs.meta b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs.meta similarity index 100% rename from Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseAssetCreator.cs.meta rename to Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs.meta diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs similarity index 97% rename from Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs rename to Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs index 74ffe4a7a6..ee2c0cc6e9 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs @@ -5,7 +5,7 @@ namespace SS3D.CodeGeneration { - public static class DatabaseAssetWriter + public static class DatabaseScriptWriter { /// /// Writes a static class of a DatabaseAssets from an AssetDatabase. diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs.meta b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs.meta similarity index 100% rename from Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseAssetWriter.cs.meta rename to Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs.meta From 32fb6ce02530a12b37e75ddb6f77ba1b0c9ec72f Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Thu, 29 Jan 2026 11:32:16 -0500 Subject: [PATCH 25/54] Fixing error of using interaction icon for audio clip (stupid me) --- Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs index 9ebfb69273..99f3393668 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs @@ -26,7 +26,7 @@ public class BikeHorn : Item public void Honk() { _animator.SetTrigger(HonkAnimation); - AudioClip bikeHornClip = Assets.Get(AssetDatabases.InteractionIcons, InteractionIcons.Take); + AudioClip bikeHornClip = Assets.Get(AssetDatabases.Sounds, Sounds.BikeHorn); SubSystems.Get().PlayAudioSource(AudioType.Sfx, bikeHornClip, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } From 1be7b0400d05d305e1c1c0b28e7d985952e9c98b Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Fri, 30 Jan 2026 12:18:22 -0500 Subject: [PATCH 26/54] Commit 12db359d1bec44d2a0cc9526f3f0272e56bc234b missing reference changes. --- Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs | 2 +- .../Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs index aed793c552..9893e7bd13 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs @@ -144,7 +144,7 @@ public void GenerateDatabaseCode() return; } - DatabaseAssetCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values, DatabaseAssetNamespaceName); + DatabaseScriptCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values, DatabaseAssetNamespaceName); } #endif } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs index 9ffd513be4..aba78ee225 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs @@ -40,7 +40,7 @@ public void CreateDatabaseCode() const string dataPath = AssetDatabase.DatabaseAssetPath; - DatabaseAssetCreator.CreateAtPath(dataPath, "AssetDatabases", IncludedAssetDatabases); + DatabaseScriptCreator.CreateAtPath(dataPath, "AssetDatabases", IncludedAssetDatabases); } #endif } From 5245559deb63a6a67342f9bae00069977e6e569c Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Fri, 30 Jan 2026 12:38:35 -0500 Subject: [PATCH 27/54] Refactor asset retrieval in WorldObjectAssetReference, CraftingRecipe, and Item to use Assets.Get method for improved consistency and clarity --- .../Data/AssetDatabases/WorldObjectAssetReference.cs | 9 --------- Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs | 3 ++- Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index b4586b67cc..baae1e24f5 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -16,15 +16,6 @@ public sealed class WorldObjectAssetReference : ScriptableObject [CanBeNull] public GameObject Prefab => Assets.Get(Database, Id); - /// - /// Short access to the Assets.Get function. - /// - /// - /// - [CanBeNull] - public T Get() - where T : Object => Assets.Get(Database, Id); - #if UNITY_EDITOR [ReadOnly] #endif diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs index 846984459b..d870f6078c 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs @@ -1,4 +1,5 @@ using QuikGraph; +using SS3D.Data; using SS3D.Data.AssetDatabases; using SS3D.Logging; using System.Collections.Generic; @@ -25,7 +26,7 @@ public class CraftingRecipe : ScriptableObject /// /// First step of the recipe, which should have the same name as the target of the recipe. /// - public string RootStepName => Target?.Get()?.name; + public string RootStepName => Target ? Assets.Get(Target.Database, Target.Id)?.name : null; public bool HasInitial => Steps.Any(x => x.IsInitialState); diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs index 4aa8518e8f..bbe857c979 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs @@ -6,6 +6,7 @@ using FishNet.Object; using FishNet.Object.Synchronizing; using SS3D.Attributes; +using SS3D.Data; using SS3D.Data.AssetDatabases; using SS3D.Interactions; using SS3D.Interactions.Interfaces; @@ -119,7 +120,7 @@ public WorldObjectAssetReference Asset } } - public Item Prefab => Asset.Get(); + public Item Prefab => Asset ? Assets.Get(Asset.Database, Asset.Id) : null; /// /// Initialise this item fields. Can only be called once. From 745481ce920405623d179e5b38b5355db34b4d0f Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Fri, 30 Jan 2026 12:45:45 -0500 Subject: [PATCH 28/54] Refactor asset retrieval in CraftingSubSystem and MultiStepCraftable to use Assets.Get method for improved consistency --- .../WorldObjectAssetReference.cs | 9 +------- .../Systems/Crafting/CraftingSubSystem.cs | 23 ++++++++++++------- .../Systems/Crafting/MultiStepCraftable.cs | 4 +++- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index baae1e24f5..f708c9f0c9 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -1,5 +1,4 @@ -using JetBrains.Annotations; -using SS3D.Attributes; +using SS3D.Attributes; using UnityEngine; namespace SS3D.Data.AssetDatabases @@ -10,12 +9,6 @@ namespace SS3D.Data.AssetDatabases /// public sealed class WorldObjectAssetReference : ScriptableObject { - /// - /// The prefab of this asset reference. Here for quick access. - /// - [CanBeNull] - public GameObject Prefab => Assets.Get(Database, Id); - #if UNITY_EDITOR [ReadOnly] #endif diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs index 5fe7a64f1b..ffe4dd3032 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs @@ -156,7 +156,8 @@ public void Craft(CraftingInteraction interaction, InteractionEvent interactionE { for (int i = 0; i < secondaryResult.Amount; i++) { - DefaultCraft(interaction, interactionEvent, secondaryResult.Asset.Prefab, link.Target); + GameObject secondaryResultPrefab = Assets.Get(secondaryResult.Asset.Database, secondaryResult.Asset.Id); + DefaultCraft(interaction, interactionEvent, secondaryResultPrefab, link.Target); } } @@ -189,7 +190,9 @@ private void SpawnOrModifyMainResult(WorldObjectAssetReference result, CraftingI { GameObject resultInstance; - if (!result.Prefab) + GameObject resultPrefab = Assets.Get(result.Database, result.Id); + + if (!resultPrefab) { Log.Error(this, $"World object reference {result} has no prefab associated"); return; @@ -197,11 +200,11 @@ private void SpawnOrModifyMainResult(WorldObjectAssetReference result, CraftingI if (link.Target.CustomCraft) { - resultInstance = result.Prefab.GetComponent()?.Craft(interaction, interactionEvent); + resultInstance = resultPrefab.GetComponent()?.Craft(interaction, interactionEvent); } else { - resultInstance = DefaultCraft(interaction, interactionEvent, result.Prefab, link.Target); + resultInstance = DefaultCraft(interaction, interactionEvent, resultPrefab, link.Target); } if (link.Tag == null || !link.Tag.ModifyResult) return; @@ -225,14 +228,16 @@ private string CurrentStepName(GameObject target) return ""; } - if (targetAssetReference.Asset.Prefab == null) + GameObject targetPrefab = Assets.Get(targetAssetReference.Asset.Database, targetAssetReference.Asset.Id); + + if (targetPrefab == null) { Log.Error(this, $"IWorldObjectAsset {targetAssetReference} has no prefab associated, returning"); return ""; } - string rootStepName = targetAssetReference.Asset.Prefab.name; + string rootStepName = targetPrefab.name; string stepName; if (target.TryGetComponent(out ICraftable craftableTarget) && craftableTarget.CurrentStepName != rootStepName) @@ -241,7 +246,7 @@ private string CurrentStepName(GameObject target) } else { - stepName = targetAssetReference.Asset.Prefab.name; + stepName = targetPrefab.name; } return stepName; @@ -548,7 +553,9 @@ private bool ResultIsValid(InteractionEvent interactionEvent, RecipeStep recipeS { if (!recipeStep.TryGetResult(out WorldObjectAssetReference recipeResult)) return true; - if (recipeResult.Prefab && recipeResult.Prefab.TryGetComponent(out PlacedTileObject result)) + GameObject recipeResultPrefab = Assets.Get(recipeResult.Database, recipeResult.Id); + + if (recipeResultPrefab && recipeResultPrefab.TryGetComponent(out PlacedTileObject result)) { return ResultIsValidPlacedTileObject(result, interactionEvent); } diff --git a/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs b/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs index 0d5ce51536..8a70bb5116 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs @@ -4,6 +4,7 @@ using SS3D.Core.Behaviours; using SS3D.Data.AssetDatabases; using FishNet.Object.Synchronizing; +using SS3D.Data; using SS3D.Logging; namespace SS3D.Systems.Crafting @@ -31,7 +32,8 @@ protected override void OnAwake() } else { - _currentStepName = targetAssetReference.Asset.Prefab.name; + GameObject targetPrefab = Assets.Get(targetAssetReference.Asset.Database, targetAssetReference.Asset.Id); + _currentStepName = targetPrefab?.name; } } } From 3d0ea6deb71f34e3791961b8f578d76e30c56878 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Mon, 2 Feb 2026 13:52:12 -0500 Subject: [PATCH 29/54] Refactor asset management to use GUIDs for WorldObjectAssetReference and other places to streamline asset retrieval --- .../Creators/DatabaseScriptCreator.cs | 7 +- .../Writers/DatabaseScriptWriter.cs | 30 +-- .../SS3D/Data/AssetDatabases/AssetDatabase.cs | 8 +- .../AssetDatabases/AssetDatabaseSettings.cs | 2 +- .../AssetDatabasesCodeGenerator.cs | 37 ++-- .../AssetDatabaseInspectorEditor.cs | 22 ++- Assets/Scripts/SS3D/Data/Assets.cs | 14 +- .../SS3D/Data/Generated/AssetDatabases.cs | 14 +- .../SS3D/Data/Generated/CraftingRecipes.cs | 12 +- .../SS3D/Data/Generated/InteractionIcons.cs | 12 +- Assets/Scripts/SS3D/Data/Generated/Items.cs | 184 +++++++++--------- .../Scripts/SS3D/Data/Generated/Materials.cs | 6 +- .../SS3D/Data/Generated/ParticlesEffects.cs | 6 +- Assets/Scripts/SS3D/Data/Generated/Sounds.cs | 22 +-- .../SS3D/Data/Generated/WorldSpaceUI.cs | 2 +- Assets/Scripts/SS3D/Systems/Roles/RoleData.cs | 26 ++- .../Scripts/SS3D/Systems/Roles/RoleLoadout.cs | 9 +- .../SS3D/Systems/Roles/RoleSubSystem.cs | 28 +-- 18 files changed, 241 insertions(+), 200 deletions(-) diff --git a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs index f0674e7387..fc8c26581e 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Creators/DatabaseScriptCreator.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; using System.Collections.Generic; using System.IO; -using System.Linq; using UnityEditor; using UnityEngine; using Object = UnityEngine.Object; @@ -14,10 +13,8 @@ public static class DatabaseScriptCreator /// /// Creates a list of database assets in the object path, with the defined class name and using a list of provided assets as its elements. /// - public static void CreateAtPath(string path, string className, [NotNull] IEnumerable assets, string namespaceName = "SS3D.Data.Generated") + public static void CreateAtPath(string path, string className, [NotNull] List assets, string namespaceName = "SS3D.Data.Generated") { - IEnumerable enums = assets.Select(reference => reference.name); - string dataPath = Application.dataPath; string fullPath = dataPath + path; @@ -26,7 +23,7 @@ public static void CreateAtPath(string path, string className, [NotNull] IEnumer Directory.CreateDirectory(fullPath); } - DatabaseScriptWriter.Write(fullPath, className, enums, namespaceName); + DatabaseScriptWriter.Write(fullPath, className, assets, namespaceName); if (EditorWindow.focusedWindow != null) { diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs index ee2c0cc6e9..8beb3940c7 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs @@ -1,7 +1,9 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; +using UnityEditor; +using Object = UnityEngine.Object; namespace SS3D.CodeGeneration { @@ -14,9 +16,9 @@ public static class DatabaseScriptWriter /// The name of the class, currently being the asset database name /// the elements to add to this class /// the namespace name to use - public static void Write(string filePath, string className, IEnumerable items, string namespaceName = "SS3D.Data.Enums") + public static void Write(string filePath, string className, List items, string namespaceName = "SS3D.Data.Enums") { - IEnumerable filtered = items.GroupBy(name => name).Select(nameGroup => nameGroup.Key); + items.Sort((obj1, obj2) => string.Compare(obj1.name, obj2.name, StringComparison.InvariantCulture)); SourceFile sourceFile = new(); @@ -27,22 +29,26 @@ public static void Write(string filePath, string className, IEnumerable using (new BracesScope(sourceFile)) { - for (int index = 0; index < filtered.ToList().Count; index++) + foreach (Object item in items) { - string member = filtered.ToList()[index]; + string itemPath = AssetDatabase.GetAssetPath(item); - if (string.IsNullOrWhiteSpace(member)) - { + if(string.IsNullOrEmpty(itemPath) || !File.Exists(itemPath)) + continue; + + if (!item || string.IsNullOrWhiteSpace(item.name)) continue; - } - char[] corrected = member.ToCharArray(); + char[] corrected = item.name.ToCharArray(); corrected[0] = corrected[0].ToString().ToUpper()[0]; StringBuilder stringBuilder = new(); stringBuilder.Append(corrected); - - sourceFile.AppendLine($"public const string {stringBuilder} = \"{stringBuilder}\";"); } + + string guid = AssetDatabase.AssetPathToGUID(itemPath); + + sourceFile.AppendLine($"public const string {stringBuilder} = \"{guid}\";"); + } } } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs index 9893e7bd13..b67e3be321 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs @@ -38,6 +38,8 @@ public sealed class AssetDatabase : ScriptableObject /// public string DatabaseName; + public string DatabaseID; + #if UNITY_EDITOR /// /// The asset group that constitutes this AssetDatabase, the system gets every asset from it and adds to an asset list. @@ -60,7 +62,7 @@ public void LoadAssetsFromAssetGroup() foreach (AddressableAssetEntry entry in AssetGroup.entries) { - Assets.TryAdd(entry.MainAsset.name, entry.MainAsset); + Assets.TryAdd(entry.guid, entry.MainAsset); } EditorUtility.SetDirty(this); @@ -83,7 +85,7 @@ public T Get([NotNull] string id) return null; } - if (typeof(T) != typeof(GameObject) && asset is GameObject gameObject) + if (typeof(T).IsSubclassOf(typeof(Component)) && asset is GameObject gameObject) { return gameObject.GetComponent(); } @@ -144,7 +146,7 @@ public void GenerateDatabaseCode() return; } - DatabaseScriptCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values, DatabaseAssetNamespaceName); + DatabaseScriptCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values.ToList(), DatabaseAssetNamespaceName); } #endif } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs index aba78ee225..63065acfc7 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabaseSettings.cs @@ -40,7 +40,7 @@ public void CreateDatabaseCode() const string dataPath = AssetDatabase.DatabaseAssetPath; - DatabaseScriptCreator.CreateAtPath(dataPath, "AssetDatabases", IncludedAssetDatabases); + DatabaseScriptCreator.CreateAtPath(dataPath, "AssetDatabases", new(IncludedAssetDatabases)); } #endif } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs index e2cda4f90a..470790d3ad 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs @@ -2,10 +2,12 @@ using Coimbra; using JetBrains.Annotations; using Serilog; +using System; using System.Collections.Generic; using System.Linq; using UnityEditor; using UnityEngine; +using Object = UnityEngine.Object; namespace SS3D.Data.AssetDatabases { @@ -76,33 +78,31 @@ private static void CreateWorldObjectAssetReferences(AssetDatabase assetDatabase int createdAssets = 0; int modifiedAssets = 0; - foreach (Object asset in assetDatabase.Assets.Values) + foreach ((string guid, Object asset) in assetDatabase.Assets) { if (asset is not GameObject gameObject) { continue; } + + WorldObjectAssetReference worldObjectAssetReference = SavedAssetReferences.Values.ToList().Find(reference => reference.Id == guid && reference.Database == assetDatabase.DatabaseID); - if (SavedAssetReferences.Values.ToList().Exists(reference => reference.Id == gameObject.name && reference.Database == assetDatabase.DatabaseName)) + if (worldObjectAssetReference) { - WorldObjectAssetReference worldObjectAssetReference = SavedAssetReferences.Values.ToList().Find(reference => reference.Id == gameObject.name && reference.Database == assetDatabase.DatabaseName); - UpdateWorldObjectAssetReference(worldObjectAssetReference, gameObject, ref modifiedAssets); } else { - WorldObjectAssetReference worldObjectAssetReference = CreateWorldObjectAssetReference(gameObject.name, assetDatabase.DatabaseName); + worldObjectAssetReference = CreateWorldObjectAssetReference(gameObject.name, guid, assetDatabase.DatabaseID); - string key = $"{WorldObjectAssetPath}{worldObjectAssetReference.Id}.asset"; + string key = $"{WorldObjectAssetPath}{gameObject.name}.asset"; - if (SavedAssetReferences.ContainsKey(key)) + if (!SavedAssetReferences.TryAdd(key, worldObjectAssetReference)) { Debug.LogError($"[{nameof(AssetDatabasesCodeGenerator)}] - {key} is already on the dictionary"); continue; } - SavedAssetReferences.Add(key, worldObjectAssetReference); - UpdateWorldObjectAssetReference(worldObjectAssetReference, gameObject, ref createdAssets); } } @@ -123,25 +123,25 @@ private static void CreateWorldObjectAssetReferences(AssetDatabase assetDatabase } } - private static WorldObjectAssetReference CreateWorldObjectAssetReference(string gameObjectName, string assetDatabaseName) + private static WorldObjectAssetReference CreateWorldObjectAssetReference(string fileName, string gameObjectID, string assetDatabaseName) { WorldObjectAssetReference worldObjectAssetReference = ScriptableObject.CreateInstance(); - worldObjectAssetReference.Id = gameObjectName; + worldObjectAssetReference.Id = gameObjectID; worldObjectAssetReference.Database = assetDatabaseName; - UnityEditor.AssetDatabase.CreateAsset(worldObjectAssetReference, $"{WorldObjectAssetPath}{worldObjectAssetReference.Id}.asset"); + UnityEditor.AssetDatabase.CreateAsset(worldObjectAssetReference, $"{WorldObjectAssetPath}{fileName}.asset"); HasModifiedAssetsWhenGenerating = true; - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Creating {worldObjectAssetReference.Id} WorldObjectReferenceAsset as it was missing."); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Creating {fileName} WorldObjectReferenceAsset as it was missing."); return worldObjectAssetReference; } private static void CleanupWorldObjectAssetReferences(List assetDatabases) { - List> assetsToDestroy = new List>(); + List> assetsToDestroy = new(); List> nullSavedAssetReferences = SavedAssetReferences.Where(pair => pair.Value == null).ToList(); foreach (KeyValuePair pair in nullSavedAssetReferences) @@ -149,16 +149,19 @@ private static void CleanupWorldObjectAssetReferences(List assetD SavedAssetReferences.Remove(pair.Key); } - List assetDatabaseAssets = new List(); + Dictionary assetsInDatabases = new(); foreach (AssetDatabase database in assetDatabases) { - assetDatabaseAssets.AddRange(database.Assets.Values.Select(o => o.name)); + foreach (string key in database.Assets.Keys) + { + assetsInDatabases.TryAdd(key, database.DatabaseID); + } } foreach (KeyValuePair savedAsset in SavedAssetReferences) { - if (assetDatabaseAssets.Exists(assetName => assetName == savedAsset.Value.Id)) + if (assetsInDatabases.TryGetValue(savedAsset.Value.Id, out string databaseID) && databaseID == savedAsset.Value.Database) { continue; } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/InspectorEditor/AssetDatabaseInspectorEditor.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/InspectorEditor/AssetDatabaseInspectorEditor.cs index 0bf73092cd..68d97ae5eb 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/InspectorEditor/AssetDatabaseInspectorEditor.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/InspectorEditor/AssetDatabaseInspectorEditor.cs @@ -1,11 +1,9 @@ #if UNITY_EDITOR -using SS3D.CodeGeneration; -using System; using System.Collections.Generic; +using System.IO; using UnityEditor; using UnityEditor.AddressableAssets.Settings; using UnityEditor.UIElements; -using UnityEngine; using UnityEngine.UIElements; using Object = UnityEngine.Object; @@ -29,7 +27,6 @@ private void OnEnable() _assetDatabase = (AssetDatabase)target; } -#if UNITY_EDITOR private void OnValidate() { if (_enumNameTextField != null) @@ -37,12 +34,13 @@ private void OnValidate() _assetDatabase.DatabaseName = _enumNameTextField.value; } + _assetDatabase.DatabaseID = GetDatabaseID(); + if (_assetGroupObjectField != null) { _assetDatabase.AssetGroup = _assetGroupObjectField.value as AddressableAssetGroup; } } -#endif /// /// This sets ups the UI for the custom inspector using the UI Toolkit @@ -95,6 +93,7 @@ public override VisualElement CreateInspectorGUI() private void HandleLoadAssetsButtonPressed() { _assetDatabase.DatabaseName = _enumNameTextField.value; + _assetDatabase.DatabaseID = GetDatabaseID(); _assetDatabase.AssetGroup = _assetGroupObjectField.value as AddressableAssetGroup; _assetDatabase.LoadAssetsFromAssetGroup(); @@ -114,6 +113,19 @@ private void HandleLoadAssetsButtonPressed() _assetDatabase.GenerateDatabaseCode(); } + + private string GetDatabaseID() + { + string assetPath = UnityEditor.AssetDatabase.GetAssetPath(_assetDatabase); + + if (!File.Exists(assetPath)) + { + return null; + } + + string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath); + return guid; + } } } #endif \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/Assets.cs b/Assets/Scripts/SS3D/Data/Assets.cs index 47cdf0a35e..a54c2e1b80 100644 --- a/Assets/Scripts/SS3D/Data/Assets.cs +++ b/Assets/Scripts/SS3D/Data/Assets.cs @@ -27,7 +27,17 @@ public static class Assets public static TAsset Get([NotNull] string databaseId, [NotNull] string assetId) where TAsset : Object { - return GetDatabase(databaseId).Get(assetId); + return GetDatabase(databaseId)?.Get(assetId); + } + + /// + /// Returns an asset from a database casting the object found to TAsset. + /// + [CanBeNull] + public static TAsset Get([NotNull] WorldObjectAssetReference assetReference) + where TAsset : Object + { + return GetDatabase(assetReference.Database)?.Get(assetReference.Id); } /// @@ -51,7 +61,7 @@ public static void LoadAssetDatabases() for (int index = 0; index < assetDatabases.Count; index++) { AssetDatabase database = assetDatabases[index]; - Databases.Add(database.DatabaseName, database); + Databases.Add(database.DatabaseID, database); } Log.Information(typeof(Assets), "{assetDatabasesCount} Asset Databases initialized", Logs.Important, assetDatabases.Count); diff --git a/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs b/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs index 10207e4a1d..d78e7ebed6 100644 --- a/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs +++ b/Assets/Scripts/SS3D/Data/Generated/AssetDatabases.cs @@ -3,13 +3,13 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class AssetDatabases { - public const string CraftingRecipes = "CraftingRecipes"; - public const string InteractionIcons = "InteractionIcons"; - public const string Items = "Items"; - public const string Materials = "Materials"; - public const string ParticlesEffects = "ParticlesEffects"; - public const string Sounds = "Sounds"; - public const string WorldSpaceUI = "WorldSpaceUI"; + public const string CraftingRecipes = "c8a3b9b514b2f7543a544259c3c97b81"; + public const string InteractionIcons = "cdf9511d9049fa14ab0433934f3537ec"; + public const string Items = "c2644d7b34e956743a0bc485e7ca5e37"; + public const string Materials = "acbbffb4c89caec469bb21b6197c7626"; + public const string ParticlesEffects = "099b9943e9299d54b82d2c1163500458"; + public const string Sounds = "43b69e36c49203a44bf20042cd83de81"; + public const string WorldSpaceUI = "830650063081cdf4d90087fc2ac74d24"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs b/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs index 9b463ea206..ac36154e93 100644 --- a/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs +++ b/Assets/Scripts/SS3D/Data/Generated/CraftingRecipes.cs @@ -3,12 +3,12 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class CraftingRecipes { - public const string WeirdComplexRecipe = "WeirdComplexRecipe"; - public const string SteelGirderUnboltedRecipe = "SteelGirderUnboltedRecipe"; - public const string SteelSheetRecipe = "SteelSheetRecipe"; - public const string ReinforcedWallRecipe = "ReinforcedWallRecipe"; - public const string SteelWallRecipe = "SteelWallRecipe"; - public const string SteelGirderRecipe = "SteelGirderRecipe"; + public const string ReinforcedWallRecipe = "115e1db3f2858c14fa6b736f67e552be"; + public const string SteelGirderRecipe = "3decef2c351e13b4194d1994c485a170"; + public const string SteelGirderUnboltedRecipe = "41ed3a9a199817b47b7ba22ecb7c1ab4"; + public const string SteelSheetRecipe = "b7f1e5d68b05f6743a606736245ff481"; + public const string SteelWallRecipe = "3d6dc37a96797e442bafcb066f1f9aef"; + public const string WeirdComplexRecipe = "5069902a314070f4ca869692cbc791fa"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs b/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs index 4ccbabfb44..ccd3ed0558 100644 --- a/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs +++ b/Assets/Scripts/SS3D/Data/Generated/InteractionIcons.cs @@ -3,12 +3,12 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class InteractionIcons { - public const string Power = "Power"; - public const string Take = "Take"; - public const string Open = "Open"; - public const string Discard = "Discard"; - public const string Honk = "Honk"; - public const string Nuke = "Nuke"; + public const string Discard = "e4d142ab75244e24c89d0c2aec36dbed"; + public const string Honk = "88c0c549992b597489791caf4a12f18c"; + public const string Nuke = "3030468639c4d15459be5f65d30a42df"; + public const string Open = "1f97d7fac1be1b448824c85e156d9746"; + public const string Power = "b22067d36fa963b4bbaf8d6085b0ebc9"; + public const string Take = "2db953f2ae8f41d4e9842d9144a9e396"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Items.cs b/Assets/Scripts/SS3D/Data/Generated/Items.cs index e86339775e..079dc3d5d4 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Items.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Items.cs @@ -3,98 +3,98 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class Items { - public const string BikeHorn = "BikeHorn"; - public const string NuclearAuthenticationDisk = "NuclearAuthenticationDisk"; - public const string ToolboxBlue = "ToolboxBlue"; - public const string SecurityPDA = "SecurityPDA"; - public const string SecurityIDCard = "SecurityIDCard"; - public const string PDA = "PDA"; - public const string IDCard = "IDCard"; - public const string Mug = "Mug"; - public const string SodaCanCola = "SodaCanCola"; - public const string SodaCanCannedLaughter = "SodaCanCannedLaughter"; - public const string SodaCanCannedAir = "SodaCanCannedAir"; - public const string SodaCanTonic = "SodaCanTonic"; - public const string SodaCanBeepyLime = "SodaCanBeepyLime"; - public const string SodaCanBeepsSoda = "SodaCanBeepsSoda"; - public const string SodaCanDukePurpleTea = "SodaCanDukePurpleTea"; - public const string Poster = "Poster"; - public const string MedicalPatch = "MedicalPatch"; - public const string BrutePatch = "BrutePatch"; - public const string BurnPatch = "BurnPatch"; - public const string DonkPocket = "DonkPocket"; - public const string Boombox = "Boombox"; - public const string FloorTile = "FloorTile"; - public const string SteelReinforcedSheet = "SteelReinforcedSheet"; - public const string SteelSheet = "SteelSheet"; - public const string Crowbar = "Crowbar"; - public const string ScrewdriverBlue = "ScrewdriverBlue"; - public const string Wrench = "Wrench"; - public const string FlashlightBlue = "FlashlightBlue"; - public const string KitchenKnife = "KitchenKnife"; - public const string TruckerCap = "TruckerCap"; - public const string Sunglasses = "Sunglasses"; - public const string FacewearGasMask = "FacewearGasMask"; - public const string HumanArmLeft = "HumanArmLeft"; - public const string HumanArmRight = "HumanArmRight"; - public const string HumanEarLeft = "HumanEarLeft"; - public const string HumanEarRight = "HumanEarRight"; - public const string HumanFootLeft = "HumanFootLeft"; - public const string HumanFootRight = "HumanFootRight"; - public const string HumanHandLeft = "HumanHandLeft"; - public const string HumanHandRight = "HumanHandRight"; - public const string HumanHead = "HumanHead"; - public const string HumanLegLeft = "HumanLegLeft"; - public const string HumanTorso = "HumanTorso"; - public const string HumanLegRight = "HumanLegRight"; - public const string HumanLungRight = "HumanLungRight"; - public const string HumanLungLeft = "HumanLungLeft"; - public const string HumanStomach = "HumanStomach"; - public const string HumanLiver = "HumanLiver"; - public const string HumanIntestineLarge = "HumanIntestineLarge"; - public const string HumanEye = "HumanEye"; - public const string HumanBrain = "HumanBrain"; - public const string Toolbelt = "Toolbelt"; - public const string Backpack = "Backpack"; - public const string HumanHeart = "HumanHeart"; - public const string Doodad = "Doodad"; - public const string Wirecutters = "Wirecutters"; - public const string Multitool = "Multitool"; - public const string PowerCellAdmin = "PowerCellAdmin"; - public const string PowerCell = "PowerCell"; - public const string SteelWall = "SteelWall"; - public const string SteelGirder = "SteelGirder"; - public const string Plenum = "Plenum"; - public const string SteelGirderUnbolted = "SteelGirderUnbolted"; - public const string GlassReinforcedSheet = "GlassReinforcedSheet"; - public const string GlassSheet = "GlassSheet"; - public const string WoodLog = "WoodLog"; - public const string WoodPlank = "WoodPlank"; - public const string SteelRod = "SteelRod"; - public const string Welder = "Welder"; - public const string PlasmaTank = "PlasmaTank"; - public const string OxygenTank = "OxygenTank"; - public const string JumpsuitGrey = "JumpsuitGrey"; - public const string JumpsuitSecurity = "JumpsuitSecurity"; - public const string JumpsuitBotany = "JumpsuitBotany"; - public const string HumanIntestineSmall = "HumanIntestineSmall"; - public const string GlassShard = "GlassShard"; - public const string JumpsuitEngineer = "JumpsuitEngineer"; - public const string MicroLaser = "MicroLaser"; - public const string MatterBin = "MatterBin"; - public const string Medkit = "Medkit"; - public const string HealthScanner = "HealthScanner"; - public const string Hatchet = "Hatchet"; - public const string ElectricalWire = "ElectricalWire"; - public const string ElectricalCable = "ElectricalCable"; - public const string SteelWindow = "SteelWindow"; - public const string SteelWallReinforced = "SteelWallReinforced"; - public const string SteelWindowReinforced = "SteelWindowReinforced"; - public const string HeadsetSecurity = "HeadsetSecurity"; - public const string Headset = "Headset"; - public const string GloveInsulated = "GloveInsulated"; - public const string ShoeHiTops = "ShoeHiTops"; - public const string ShoeJackboots = "ShoeJackboots"; + public const string Backpack = "ddaa28fac1956b2428aff1dac1d89707"; + public const string BikeHorn = "11f824c472e04854e95065dda095e8f4"; + public const string Boombox = "1d2cf546d53e3fe4c9103007427aaec7"; + public const string BrutePatch = "b5be0a52925e2674193d081d2deb68cb"; + public const string BurnPatch = "162e188d33a82b440a239f20901c716a"; + public const string Crowbar = "7becfab153276864f9fc7636a839d837"; + public const string DonkPocket = "56b1aff2041026242bed0f064dee56bb"; + public const string Doodad = "f6528d8afa18fa14998a0158260ef26c"; + public const string ElectricalCable = "0e69918696f58e04f846e985ec7405fe"; + public const string ElectricalWire = "cc71128d4bcc0c548ac11481000ac424"; + public const string FacewearGasMask = "bf177f8bab26bc84b87fd9a971004418"; + public const string FlashlightBlue = "781dd9024aaa53444bc3deeaa9708fbb"; + public const string FloorTile = "404443f7c306fc8469698745624fa3bf"; + public const string GlassReinforcedSheet = "a1a7407e08bb2914c97f431063bf83e2"; + public const string GlassShard = "5cab1a9f6c7f74948b84d0d625319efe"; + public const string GlassSheet = "e2a06f02e6a7e0348bdc535344bfe1f3"; + public const string GloveInsulated = "65679cf5a30d6dd458666804af7c3ca3"; + public const string Hatchet = "9e967cb4084bf064c8a0ca5f57a33b0c"; + public const string Headset = "db15899bc1eb2794fb2b24129852a209"; + public const string HeadsetSecurity = "a38ee818c953a404787757d8d20d2851"; + public const string HealthScanner = "e9f99df80a74fd242aa46e53c7ec0376"; + public const string HumanArmLeft = "06b6be83779804245b7f6411fe07b851"; + public const string HumanArmRight = "432a4ad70e41e5c4f8f913f76fe0e66c"; + public const string HumanBrain = "7579883b8dd8801448a176adace4860b"; + public const string HumanEarLeft = "e02f11b9239b52748a5ed5afd1c5cbd3"; + public const string HumanEarRight = "30794a01d5f4c174a9d20b2c632f2dca"; + public const string HumanEye = "071581df025e1ba49a8a75eb39611ff6"; + public const string HumanFootLeft = "94aaf82bb6ab002418e01d9cc7c6eaaa"; + public const string HumanFootRight = "e60ba1e09be8316448e419ecbdfb64a6"; + public const string HumanHandLeft = "35dfc7c3f708a5b48a206b4a44e7ab49"; + public const string HumanHandRight = "7f5954f009d06b2439ca637b43920440"; + public const string HumanHead = "cc54bc74b2f4c2349b1f84b501b0a091"; + public const string HumanHeart = "fccdc78a6cf916047ba52f2877f755e5"; + public const string HumanIntestineLarge = "1e304f9a331c2ba419514ef8afb8a13c"; + public const string HumanIntestineSmall = "9c5418cbebef419429574992d3e296a3"; + public const string HumanLegLeft = "ecaf79b0a74bdb443a350e88daa94a66"; + public const string HumanLegRight = "242a937784a622f4f8a6e6d097e0737c"; + public const string HumanLiver = "d75ff9a3ac207a84487ec1ee73a676fc"; + public const string HumanLungLeft = "a019475d05ec8824494b0fa88e2282d8"; + public const string HumanLungRight = "a8b265034e3f79344a6067b406e1bff6"; + public const string HumanStomach = "2bc6f6a968d5ba04c919ba56d0ccdab4"; + public const string HumanTorso = "4a9d34a6cf84ef045a740513d8ae30b1"; + public const string IDCard = "d8b0c8d1ddcdeb24d9763054c103c9fe"; + public const string JumpsuitBotany = "be3fcf1a74268ad49bfedb1edd9f5318"; + public const string JumpsuitEngineer = "7436f4976849b994aaee40df1bca7d89"; + public const string JumpsuitGrey = "236b51ddc6f9aa94ca92579082370c06"; + public const string JumpsuitSecurity = "93ad90421a3b2f64e8fdb9e95a42ba90"; + public const string KitchenKnife = "411b513efc8f06a40aecfc47d0c5fc5a"; + public const string MatterBin = "ed77d98d3e75b7946b404face1fe8f82"; + public const string MedicalPatch = "2332a158259900e4f8a237fa8daff266"; + public const string Medkit = "1e64a1c37be1f7c44a5d242d6ec6da10"; + public const string MicroLaser = "84cec183559b4954c883b11f20f767c9"; + public const string Mug = "d9aabfd5d726a7f499b8e360d919eba4"; + public const string Multitool = "2ca5f2886cf2f19428b50bf284689b86"; + public const string NuclearAuthenticationDisk = "1ae18785d74e9fa4699b6f6de889c243"; + public const string OxygenTank = "5479411218b869144b7d09d6db6dc58e"; + public const string PDA = "79260483ae5d3e04fa272e092b49abac"; + public const string PlasmaTank = "e3fb39f0a84acf541b6ee828550a1708"; + public const string Plenum = "3b33b5cf16a677a4e85a110679cde32a"; + public const string Poster = "b044d7bdb55405046a9055726a779eb1"; + public const string PowerCell = "de67200a4c96d444f800399a033ddfef"; + public const string PowerCellAdmin = "c69ed93dc225ea049bbf1a02662c48c0"; + public const string ScrewdriverBlue = "9c8363ee7f934bd4b8ee5a2e30da1269"; + public const string SecurityIDCard = "ff95abc9c2b779340a1b50f1a128a934"; + public const string SecurityPDA = "2a63163a4db141744a802f3ff67087db"; + public const string ShoeHiTops = "81faf4debf00a0a478b924176f48d011"; + public const string ShoeJackboots = "535ed7c02b5cbdc43ae2b234a963c5cc"; + public const string SodaCanBeepsSoda = "f490a74616c067c4f83995017e10b420"; + public const string SodaCanBeepyLime = "4e6899916bc8fd742a07f32b3a04de12"; + public const string SodaCanCannedAir = "e4281cb43d1443d4388737777fdd98d8"; + public const string SodaCanCannedLaughter = "dceb056e41b5c634f9933423de8e075c"; + public const string SodaCanCola = "92d6696a323ef66448190e8e9d69fd22"; + public const string SodaCanDukePurpleTea = "177428b73bad0fb4a89d1a64b85629bf"; + public const string SodaCanTonic = "a7c35693adae32f43b4d7fe2eb8b091b"; + public const string SteelGirder = "6c2559c2017ada740b245951a23c2e1d"; + public const string SteelGirderUnbolted = "5dba4171f2124fb48b0e32c0e10841e0"; + public const string SteelReinforcedSheet = "f88a398ad3d01454f955de9c337d9b99"; + public const string SteelRod = "48fa93e2da7acb3499e400becf2afc26"; + public const string SteelSheet = "4cb99cf2fee96f944abbacc51b0b701c"; + public const string SteelWall = "45d13347efae0f54882e0e56dd770bb1"; + public const string SteelWallReinforced = "abcc60752234e584d8d98c9dec03e7cc"; + public const string SteelWindow = "b9c224febb4233f4e912745553097652"; + public const string SteelWindowReinforced = "f2493b5478dd8e946ba98861f533362e"; + public const string Sunglasses = "9b9f6bd470226a74b903e74dbe9e423a"; + public const string Toolbelt = "40d904629802fc942860ce878e78efef"; + public const string ToolboxBlue = "264ea51d92067c14ebc6633999afac78"; + public const string TruckerCap = "1ef3c21a685ec2d4e9f0876719839d5f"; + public const string Welder = "06d944205e6b6dd489af078fa85fb878"; + public const string Wirecutters = "41a1c8c211dc32c4d8ffca5f0892f9dc"; + public const string WoodLog = "2767aeb6e6fd53b43a1cb305789834d4"; + public const string WoodPlank = "4aee3fb97a6a2d442804c8c0b8347a92"; + public const string Wrench = "772da386eb7b01745913050fee544c32"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Materials.cs b/Assets/Scripts/SS3D/Data/Generated/Materials.cs index 4d333ea351..34609dfe82 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Materials.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Materials.cs @@ -3,9 +3,9 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class Materials { - public const string DeleteConstruction = "DeleteConstruction"; - public const string InvalidConstruction = "InvalidConstruction"; - public const string ValidConstruction = "ValidConstruction"; + public const string DeleteConstruction = "ed5a1263eb564c94abc6407ac0919ea7"; + public const string InvalidConstruction = "e9b99cfb2e59ffa40a062c2f4b88b729"; + public const string ValidConstruction = "6d2a18aa72cbaf94694dce9f8451160b"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs b/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs index 67c8c6e970..150edd3aaa 100644 --- a/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs +++ b/Assets/Scripts/SS3D/Data/Generated/ParticlesEffects.cs @@ -3,9 +3,9 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class ParticlesEffects { - public const string AttackParticles = "AttackParticles"; - public const string BleedingParticle = "BleedingParticle"; - public const string ConstructionParticle = "ConstructionParticle"; + public const string AttackParticles = "17b0d9163e9cdf14aa557557e7d9d76b"; + public const string BleedingParticle = "a6a77c26ee7edd94c804f4ddd851c8ba"; + public const string ConstructionParticle = "ca5e6b5f7c6c5054a8f8155ef44e3e43"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/Sounds.cs b/Assets/Scripts/SS3D/Data/Generated/Sounds.cs index 215805f6c6..7f9b38cb91 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Sounds.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Sounds.cs @@ -3,17 +3,17 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class Sounds { - public const string BikeHorn = "BikeHorn"; - public const string Title1 = "Title1"; - public const string Title2 = "Title2"; - public const string Title3 = "Title3"; - public const string Can1 = "Can1"; - public const string Can2 = "Can2"; - public const string Can3 = "Can3"; - public const string Can4 = "Can4"; - public const string AirlockClose = "AirlockClose"; - public const string AirlockOpen = "AirlockOpen"; - public const string FuelPowerGenerator = "FuelPowerGenerator"; + public const string AirlockClose = "fc2485e75c5d3ab4e86e814043c9e9cb"; + public const string AirlockOpen = "34297ba204a9f3944872f100baaa2369"; + public const string BikeHorn = "8c8823796bbcb23438fcf68260070383"; + public const string Can1 = "1a34c805f84be3b4caac14d7de790607"; + public const string Can2 = "8d93fdf9dcada204a952e29213f0293f"; + public const string Can3 = "b315c4abdef36244fb211c5f643d411a"; + public const string Can4 = "f00c6b5a098e84b4b87d80d23b4f295a"; + public const string FuelPowerGenerator = "59b65ecaf8dffbf49876ab2768490b59"; + public const string Title1 = "ec8b849764a7e9147b2a565f81a1ca42"; + public const string Title2 = "3f51862f0b88a5243a8cceb97147489d"; + public const string Title3 = "fd331e360db5fbb448e66367e41d1893"; } } diff --git a/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs b/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs index b7ee1ba58d..70ba1a4430 100644 --- a/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs +++ b/Assets/Scripts/SS3D/Data/Generated/WorldSpaceUI.cs @@ -3,7 +3,7 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class WorldSpaceUI { - public const string LoadingBar = "LoadingBar"; + public const string LoadingBar = "03bcc1824d3b20748b912ca532f86bb9"; } } diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs index 536db3a790..0daeada4c1 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs @@ -1,3 +1,4 @@ +using SS3D.Data.AssetDatabases; using System; using System.Collections.Generic; using UnityEngine; @@ -11,16 +12,25 @@ namespace SS3D.Systems.Roles [Serializable, CreateAssetMenu(fileName = "Role Data", menuName = "Roles/RoleData")] public class RoleData : ScriptableObject { - [SerializeField] private string _roleName; - [SerializeField] private GameObject _pdaPrefab; - [SerializeField] private GameObject _idCardPrefab; - [SerializeField] private List _permissions = new List(); - [SerializeField] private RoleLoadout _loadout; + [SerializeField] + private string _roleName; + [SerializeField] + private WorldObjectAssetReference _pdaAsset; + [SerializeField] + private WorldObjectAssetReference _idCardAsset; + [SerializeField] + private List _permissions = new(); + [SerializeField] + private RoleLoadout _loadout; public string Name => _roleName; - public GameObject IDCardPrefab => _idCardPrefab; - public GameObject PDAPrefab => _pdaPrefab; + + public WorldObjectAssetReference IDCardAsset => _idCardAsset; + + public WorldObjectAssetReference PDAAsset => _pdaAsset; + public List Permissions => _permissions; + public RoleLoadout Loadout => _loadout; } -} +} \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs index 8e3320f079..55b9126747 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs @@ -1,7 +1,7 @@ using Coimbra; +using SS3D.Data.AssetDatabases; using SS3D.Systems.Inventory.Containers; using UnityEngine; -using UnityEngine.Serialization; namespace SS3D.Systems.Roles { @@ -11,10 +11,9 @@ namespace SS3D.Systems.Roles [CreateAssetMenu(fileName = "Loadout", menuName = "Roles/Loadout")] public class RoleLoadout : ScriptableObject { - public GameObject HandLeft; - public GameObject HandRight; + public WorldObjectAssetReference HandLeftAsset; + public WorldObjectAssetReference HandRightAsset; - [FormerlySerializedAs("ItemsToEquip")] - public SerializableDictionary Equipment; + public SerializableDictionary EquipmentAssets; } } diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs index efd60ed3fe..97bd3cf324 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs @@ -11,6 +11,8 @@ using SS3D.Systems.Inventory.Containers; using SS3D.Systems.Inventory.Items; using SS3D.Core; +using SS3D.Data; +using SS3D.Data.AssetDatabases; using SS3D.Systems.Inventory.Items.Generic; namespace SS3D.Systems.Roles @@ -166,8 +168,8 @@ private void SpawnIdentificationItems(Entity entity, RoleData role) if (!inventory.TryGetTypeContainer(ContainerType.Identification, 0, out AttachedContainer container)) return; - Item pdaItem = itemSystem.SpawnItemInContainer(role.PDAPrefab, container); - Item idCardItem = itemSystem.SpawnItem(role.IDCardPrefab.name, Vector3.zero, Quaternion.identity); + Item pdaItem = SpawnItemInSlot(role.PDAAsset, true, container); + Item idCardItem = itemSystem.SpawnItem(role.IDCardAsset.Id, Vector3.zero, Quaternion.identity); PDA pda = (PDA)pdaItem; IDCard idCard = (IDCard)idCardItem; @@ -207,9 +209,9 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) containers.Add(inventoryContainer.ContainerType, inventoryContainer); } - foreach (KeyValuePair itemToEquip in loadout.Equipment) + foreach (KeyValuePair itemToEquip in loadout.EquipmentAssets) { - if (itemToEquip.Value == null) + if (!itemToEquip.Value) { continue; } @@ -220,16 +222,15 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) } } - if (loadout.HandLeft != null) + if (loadout.HandLeftAsset) { - SpawnItemInSlot(loadout.HandLeft, true, handContainers[0]); + SpawnItemInSlot(loadout.HandLeftAsset, true, handContainers[0]); } - if (loadout.HandRight != null) + if (loadout.HandRightAsset) { - SpawnItemInSlot(loadout.HandRight, true, handContainers[1]); + SpawnItemInSlot(loadout.HandRightAsset, true, handContainers[1]); } - inventory.TriggerInventorySetup(); } @@ -237,18 +238,19 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) /// /// Spawns an item inside a container slot after checking for boolean /// - /// The id of the item to be spawned + /// /// Condition indicating if the item should be spawned /// Container the item will be spawned in - private void SpawnItemInSlot(GameObject itemId, bool shouldSpawn, AttachedContainer container) + private Item SpawnItemInSlot(WorldObjectAssetReference assetReference, bool shouldSpawn, AttachedContainer container) { if (!shouldSpawn) { - return; + return null; } ItemSubSystem itemSystem = SubSystems.Get(); - itemSystem.SpawnItemInContainer(itemId, container); + GameObject gameObjectToSpawn = Assets.Get(assetReference); + return itemSystem.SpawnItemInContainer(gameObjectToSpawn, container); } } } \ No newline at end of file From be9e035c4c32fa92234639e86c954222bbf6dacc Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Mon, 2 Feb 2026 14:08:15 -0500 Subject: [PATCH 30/54] Update asset IDs and databases for various items to improve asset management consistency --- .../Data/Databases/CraftingRecipes.asset | 13 +- .../Data/Databases/InteractionIcons.asset | 13 +- Assets/Content/Data/Databases/Items.asset | 185 +++++++++--------- Assets/Content/Data/Databases/Materials.asset | 7 +- .../Data/Databases/ParticlesEffects.asset | 7 +- Assets/Content/Data/Databases/Sounds.asset | 23 +-- .../Content/Data/Databases/WorldSpaceUI.asset | 3 +- Assets/Content/Data/Roles/Assistant.asset | 4 +- .../Roles/Loadouts/AssistantLoadout.asset | 16 +- .../Data/Roles/Loadouts/SecurityLoadout.asset | 12 +- Assets/Content/Data/Roles/Security.asset | 4 +- .../AttackParticles.asset | 4 +- .../WorldObjectAssetReferences/Backpack.asset | 4 +- .../WorldObjectAssetReferences/BikeHorn.asset | 4 +- .../BleedingParticle.asset | 4 +- .../WorldObjectAssetReferences/Boombox.asset | 4 +- .../BrutePatch.asset | 4 +- .../BurnPatch.asset | 4 +- .../ConstructionParticle.asset | 4 +- .../WorldObjectAssetReferences/Crowbar.asset | 4 +- .../DonkPocket.asset | 4 +- .../WorldObjectAssetReferences/Doodad.asset | 4 +- .../ElectricalCable.asset | 4 +- .../ElectricalWire.asset | 4 +- .../FacewearGasMask.asset | 4 +- .../FlashlightBlue.asset | 4 +- .../FloorTile.asset | 4 +- .../GlassReinforcedSheet.asset | 4 +- .../GlassShard.asset | 4 +- .../GlassSheet.asset | 4 +- .../GloveInsulated.asset | 4 +- .../WorldObjectAssetReferences/Hatchet.asset | 4 +- .../WorldObjectAssetReferences/Headset.asset | 4 +- .../HeadsetSecurity.asset | 4 +- .../HealthScanner.asset | 4 +- .../HumanArmLeft.asset | 4 +- .../HumanArmRight.asset | 4 +- .../HumanBrain.asset | 4 +- .../HumanEarLeft.asset | 4 +- .../HumanEarRight.asset | 4 +- .../WorldObjectAssetReferences/HumanEye.asset | 4 +- .../HumanFootLeft.asset | 4 +- .../HumanFootRight.asset | 4 +- .../HumanHandLeft.asset | 4 +- .../HumanHandRight.asset | 4 +- .../HumanHead.asset | 4 +- .../HumanHeart.asset | 4 +- .../HumanIntestineLarge.asset | 4 +- .../HumanIntestineSmall.asset | 4 +- .../HumanLegLeft.asset | 4 +- .../HumanLegRight.asset | 4 +- .../HumanLiver.asset | 4 +- .../HumanLungLeft.asset | 4 +- .../HumanLungRight.asset | 4 +- .../HumanStomach.asset | 4 +- .../HumanTorso.asset | 4 +- .../WorldObjectAssetReferences/IDCard.asset | 4 +- .../JumpsuitBotany.asset | 4 +- .../JumpsuitEngineer.asset | 4 +- .../JumpsuitGrey.asset | 4 +- .../JumpsuitSecurity.asset | 4 +- .../KitchenKnife.asset | 4 +- .../LoadingBar.asset | 4 +- .../MatterBin.asset | 4 +- .../MedicalPatch.asset | 4 +- .../WorldObjectAssetReferences/Medkit.asset | 4 +- .../MicroLaser.asset | 4 +- .../Data/WorldObjectAssetReferences/Mug.asset | 4 +- .../Multitool.asset | 4 +- .../NuclearAuthenticationDisk.asset | 4 +- .../OxygenTank.asset | 4 +- .../Data/WorldObjectAssetReferences/PDA.asset | 4 +- .../PlasmaTank.asset | 4 +- .../WorldObjectAssetReferences/Plenum.asset | 4 +- .../WorldObjectAssetReferences/Poster.asset | 4 +- .../PowerCell.asset | 4 +- .../PowerCellAdmin.asset | 4 +- .../ScrewdriverBlue.asset | 4 +- .../SecurityIDCard.asset | 4 +- .../SecurityPDA.asset | 4 +- .../ShoeHiTops.asset | 4 +- .../ShoeJackboots.asset | 4 +- .../SodaCanBeepsSoda.asset | 4 +- .../SodaCanBeepyLime.asset | 4 +- .../SodaCanCannedAir.asset | 4 +- .../SodaCanCannedLaughter.asset | 4 +- .../SodaCanCola.asset | 4 +- .../SodaCanDukePurpleTea.asset | 4 +- .../SodaCanTonic.asset | 4 +- .../SteelGirder.asset | 4 +- .../SteelGirderUnbolted.asset | 4 +- .../SteelReinforcedSheet.asset | 4 +- .../WorldObjectAssetReferences/SteelRod.asset | 4 +- .../SteelSheet.asset | 4 +- .../SteelWall.asset | 4 +- .../SteelWallReinforced.asset | 4 +- .../SteelWindow.asset | 4 +- .../SteelWindowReinforced.asset | 4 +- .../Sunglasses.asset | 4 +- .../WorldObjectAssetReferences/Toolbelt.asset | 4 +- .../ToolboxBlue.asset | 4 +- .../TruckerCap.asset | 4 +- .../WorldObjectAssetReferences/Welder.asset | 4 +- .../Wirecutters.asset | 4 +- .../WorldObjectAssetReferences/WoodLog.asset | 4 +- .../WoodPlank.asset | 4 +- .../WorldObjectAssetReferences/Wrench.asset | 4 +- 107 files changed, 339 insertions(+), 332 deletions(-) diff --git a/Assets/Content/Data/Databases/CraftingRecipes.asset b/Assets/Content/Data/Databases/CraftingRecipes.asset index bde7d6376b..02f8c697d9 100644 --- a/Assets/Content/Data/Databases/CraftingRecipes.asset +++ b/Assets/Content/Data/Databases/CraftingRecipes.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: CraftingRecipes m_EditorClassIdentifier: DatabaseName: CraftingRecipes + DatabaseID: c8a3b9b514b2f7543a544259c3c97b81 AssetGroup: {fileID: 11400000, guid: ead2cce9e35a7304ab5b8cc67d03347b, type: 2} Assets: _list: - - _key: WeirdComplexRecipe + - _key: 5069902a314070f4ca869692cbc791fa _value: {fileID: 11400000, guid: 5069902a314070f4ca869692cbc791fa, type: 2} - - _key: SteelGirderUnboltedRecipe + - _key: 41ed3a9a199817b47b7ba22ecb7c1ab4 _value: {fileID: 11400000, guid: 41ed3a9a199817b47b7ba22ecb7c1ab4, type: 2} - - _key: SteelSheetRecipe + - _key: b7f1e5d68b05f6743a606736245ff481 _value: {fileID: 11400000, guid: b7f1e5d68b05f6743a606736245ff481, type: 2} - - _key: ReinforcedWallRecipe + - _key: 115e1db3f2858c14fa6b736f67e552be _value: {fileID: 11400000, guid: 115e1db3f2858c14fa6b736f67e552be, type: 2} - - _key: SteelWallRecipe + - _key: 3d6dc37a96797e442bafcb066f1f9aef _value: {fileID: 11400000, guid: 3d6dc37a96797e442bafcb066f1f9aef, type: 2} - - _key: SteelGirderRecipe + - _key: 3decef2c351e13b4194d1994c485a170 _value: {fileID: 11400000, guid: 3decef2c351e13b4194d1994c485a170, type: 2} _new: diff --git a/Assets/Content/Data/Databases/InteractionIcons.asset b/Assets/Content/Data/Databases/InteractionIcons.asset index 24c1c443b9..af86fbdd14 100644 --- a/Assets/Content/Data/Databases/InteractionIcons.asset +++ b/Assets/Content/Data/Databases/InteractionIcons.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: InteractionIcons m_EditorClassIdentifier: DatabaseName: InteractionIcons + DatabaseID: cdf9511d9049fa14ab0433934f3537ec AssetGroup: {fileID: 11400000, guid: 43f5c5834bd38014f9dbacb0f51bcc54, type: 2} Assets: _list: - - _key: Power + - _key: b22067d36fa963b4bbaf8d6085b0ebc9 _value: {fileID: 21300000, guid: b22067d36fa963b4bbaf8d6085b0ebc9, type: 2} - - _key: Take + - _key: 2db953f2ae8f41d4e9842d9144a9e396 _value: {fileID: 21300000, guid: 2db953f2ae8f41d4e9842d9144a9e396, type: 2} - - _key: Open + - _key: 1f97d7fac1be1b448824c85e156d9746 _value: {fileID: 21300000, guid: 1f97d7fac1be1b448824c85e156d9746, type: 2} - - _key: Discard + - _key: e4d142ab75244e24c89d0c2aec36dbed _value: {fileID: 21300000, guid: e4d142ab75244e24c89d0c2aec36dbed, type: 2} - - _key: Honk + - _key: 88c0c549992b597489791caf4a12f18c _value: {fileID: 21300000, guid: 88c0c549992b597489791caf4a12f18c, type: 2} - - _key: Nuke + - _key: 3030468639c4d15459be5f65d30a42df _value: {fileID: 21300000, guid: 3030468639c4d15459be5f65d30a42df, type: 2} _new: diff --git a/Assets/Content/Data/Databases/Items.asset b/Assets/Content/Data/Databases/Items.asset index ef21b70186..22e0d86fa1 100644 --- a/Assets/Content/Data/Databases/Items.asset +++ b/Assets/Content/Data/Databases/Items.asset @@ -13,191 +13,192 @@ MonoBehaviour: m_Name: Items m_EditorClassIdentifier: DatabaseName: Items + DatabaseID: c2644d7b34e956743a0bc485e7ca5e37 AssetGroup: {fileID: 11400000, guid: 8e95016540bf27c4eb11580ec096568a, type: 2} Assets: _list: - - _key: BikeHorn + - _key: 11f824c472e04854e95065dda095e8f4 _value: {fileID: 6891363543938182813, guid: 11f824c472e04854e95065dda095e8f4, type: 3} - - _key: NuclearAuthenticationDisk + - _key: 1ae18785d74e9fa4699b6f6de889c243 _value: {fileID: 6891363543938182813, guid: 1ae18785d74e9fa4699b6f6de889c243, type: 3} - - _key: ToolboxBlue + - _key: 264ea51d92067c14ebc6633999afac78 _value: {fileID: 5533951594911835035, guid: 264ea51d92067c14ebc6633999afac78, type: 3} - - _key: SecurityPDA + - _key: 2a63163a4db141744a802f3ff67087db _value: {fileID: 5261116577612792016, guid: 2a63163a4db141744a802f3ff67087db, type: 3} - - _key: SecurityIDCard + - _key: ff95abc9c2b779340a1b50f1a128a934 _value: {fileID: 5261116577612792016, guid: ff95abc9c2b779340a1b50f1a128a934, type: 3} - - _key: PDA + - _key: 79260483ae5d3e04fa272e092b49abac _value: {fileID: 5261116577612792016, guid: 79260483ae5d3e04fa272e092b49abac, type: 3} - - _key: IDCard + - _key: d8b0c8d1ddcdeb24d9763054c103c9fe _value: {fileID: 5261116577612792016, guid: d8b0c8d1ddcdeb24d9763054c103c9fe, type: 3} - - _key: Mug + - _key: d9aabfd5d726a7f499b8e360d919eba4 _value: {fileID: 5261116577612792016, guid: d9aabfd5d726a7f499b8e360d919eba4, type: 3} - - _key: SodaCanCola + - _key: 92d6696a323ef66448190e8e9d69fd22 _value: {fileID: 3995435954105705608, guid: 92d6696a323ef66448190e8e9d69fd22, type: 3} - - _key: SodaCanCannedLaughter + - _key: dceb056e41b5c634f9933423de8e075c _value: {fileID: 8047892061280000217, guid: dceb056e41b5c634f9933423de8e075c, type: 3} - - _key: SodaCanCannedAir + - _key: e4281cb43d1443d4388737777fdd98d8 _value: {fileID: 5774385816057912484, guid: e4281cb43d1443d4388737777fdd98d8, type: 3} - - _key: SodaCanTonic + - _key: a7c35693adae32f43b4d7fe2eb8b091b _value: {fileID: 2434868383632068905, guid: a7c35693adae32f43b4d7fe2eb8b091b, type: 3} - - _key: SodaCanBeepyLime + - _key: 4e6899916bc8fd742a07f32b3a04de12 _value: {fileID: 6405503896595845848, guid: 4e6899916bc8fd742a07f32b3a04de12, type: 3} - - _key: SodaCanBeepsSoda + - _key: f490a74616c067c4f83995017e10b420 _value: {fileID: 4482577744063562115, guid: f490a74616c067c4f83995017e10b420, type: 3} - - _key: SodaCanDukePurpleTea + - _key: 177428b73bad0fb4a89d1a64b85629bf _value: {fileID: 169984495843080388, guid: 177428b73bad0fb4a89d1a64b85629bf, type: 3} - - _key: Poster + - _key: b044d7bdb55405046a9055726a779eb1 _value: {fileID: 5161561551087789900, guid: b044d7bdb55405046a9055726a779eb1, type: 3} - - _key: MedicalPatch + - _key: 2332a158259900e4f8a237fa8daff266 _value: {fileID: 4068007204767187790, guid: 2332a158259900e4f8a237fa8daff266, type: 3} - - _key: BrutePatch + - _key: b5be0a52925e2674193d081d2deb68cb _value: {fileID: 4068007204767187790, guid: b5be0a52925e2674193d081d2deb68cb, type: 3} - - _key: BurnPatch + - _key: 162e188d33a82b440a239f20901c716a _value: {fileID: 4068007204767187790, guid: 162e188d33a82b440a239f20901c716a, type: 3} - - _key: DonkPocket + - _key: 56b1aff2041026242bed0f064dee56bb _value: {fileID: 3969530706517246485, guid: 56b1aff2041026242bed0f064dee56bb, type: 3} - - _key: Boombox + - _key: 1d2cf546d53e3fe4c9103007427aaec7 _value: {fileID: 8197868818743549203, guid: 1d2cf546d53e3fe4c9103007427aaec7, type: 3} - - _key: FloorTile + - _key: 404443f7c306fc8469698745624fa3bf _value: {fileID: 7125681683583715523, guid: 404443f7c306fc8469698745624fa3bf, type: 3} - - _key: SteelReinforcedSheet + - _key: f88a398ad3d01454f955de9c337d9b99 _value: {fileID: 7125681683583715523, guid: f88a398ad3d01454f955de9c337d9b99, type: 3} - - _key: SteelSheet + - _key: 4cb99cf2fee96f944abbacc51b0b701c _value: {fileID: 7125681683583715523, guid: 4cb99cf2fee96f944abbacc51b0b701c, type: 3} - - _key: Crowbar + - _key: 7becfab153276864f9fc7636a839d837 _value: {fileID: 1888703706215615217, guid: 7becfab153276864f9fc7636a839d837, type: 3} - - _key: ScrewdriverBlue + - _key: 9c8363ee7f934bd4b8ee5a2e30da1269 _value: {fileID: 2402587210622244651, guid: 9c8363ee7f934bd4b8ee5a2e30da1269, type: 3} - - _key: Wrench + - _key: 772da386eb7b01745913050fee544c32 _value: {fileID: 3792017003477948967, guid: 772da386eb7b01745913050fee544c32, type: 3} - - _key: FlashlightBlue + - _key: 781dd9024aaa53444bc3deeaa9708fbb _value: {fileID: 833752496874958856, guid: 781dd9024aaa53444bc3deeaa9708fbb, type: 3} - - _key: KitchenKnife + - _key: 411b513efc8f06a40aecfc47d0c5fc5a _value: {fileID: 3794527162878356835, guid: 411b513efc8f06a40aecfc47d0c5fc5a, type: 3} - - _key: TruckerCap + - _key: 1ef3c21a685ec2d4e9f0876719839d5f _value: {fileID: 2601952054522247362, guid: 1ef3c21a685ec2d4e9f0876719839d5f, type: 3} - - _key: Sunglasses + - _key: 9b9f6bd470226a74b903e74dbe9e423a _value: {fileID: 2667451333340596270, guid: 9b9f6bd470226a74b903e74dbe9e423a, type: 3} - - _key: FacewearGasMask + - _key: bf177f8bab26bc84b87fd9a971004418 _value: {fileID: 1687938131941834081, guid: bf177f8bab26bc84b87fd9a971004418, type: 3} - - _key: HumanArmLeft + - _key: 06b6be83779804245b7f6411fe07b851 _value: {fileID: 1888615333292121711, guid: 06b6be83779804245b7f6411fe07b851, type: 3} - - _key: HumanArmRight + - _key: 432a4ad70e41e5c4f8f913f76fe0e66c _value: {fileID: 832941577213411195, guid: 432a4ad70e41e5c4f8f913f76fe0e66c, type: 3} - - _key: HumanEarLeft + - _key: e02f11b9239b52748a5ed5afd1c5cbd3 _value: {fileID: 3861326785315191697, guid: e02f11b9239b52748a5ed5afd1c5cbd3, type: 3} - - _key: HumanEarRight + - _key: 30794a01d5f4c174a9d20b2c632f2dca _value: {fileID: 3299576395946724586, guid: 30794a01d5f4c174a9d20b2c632f2dca, type: 3} - - _key: HumanFootLeft + - _key: 94aaf82bb6ab002418e01d9cc7c6eaaa _value: {fileID: 6958959792659314810, guid: 94aaf82bb6ab002418e01d9cc7c6eaaa, type: 3} - - _key: HumanFootRight + - _key: e60ba1e09be8316448e419ecbdfb64a6 _value: {fileID: 6632297082311541152, guid: e60ba1e09be8316448e419ecbdfb64a6, type: 3} - - _key: HumanHandLeft + - _key: 35dfc7c3f708a5b48a206b4a44e7ab49 _value: {fileID: 2207730063960764759, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3} - - _key: HumanHandRight + - _key: 7f5954f009d06b2439ca637b43920440 _value: {fileID: 7546631754298856378, guid: 7f5954f009d06b2439ca637b43920440, type: 3} - - _key: HumanHead + - _key: cc54bc74b2f4c2349b1f84b501b0a091 _value: {fileID: 8006468508714419156, guid: cc54bc74b2f4c2349b1f84b501b0a091, type: 3} - - _key: HumanLegLeft + - _key: ecaf79b0a74bdb443a350e88daa94a66 _value: {fileID: 3470038122221450171, guid: ecaf79b0a74bdb443a350e88daa94a66, type: 3} - - _key: HumanTorso + - _key: 4a9d34a6cf84ef045a740513d8ae30b1 _value: {fileID: 5562010227207703736, guid: 4a9d34a6cf84ef045a740513d8ae30b1, type: 3} - - _key: HumanLegRight + - _key: 242a937784a622f4f8a6e6d097e0737c _value: {fileID: 8256619991674398311, guid: 242a937784a622f4f8a6e6d097e0737c, type: 3} - - _key: HumanLungRight + - _key: a8b265034e3f79344a6067b406e1bff6 _value: {fileID: 8304480218026041231, guid: a8b265034e3f79344a6067b406e1bff6, type: 3} - - _key: HumanLungLeft + - _key: a019475d05ec8824494b0fa88e2282d8 _value: {fileID: 1705603677127675533, guid: a019475d05ec8824494b0fa88e2282d8, type: 3} - - _key: HumanStomach + - _key: 2bc6f6a968d5ba04c919ba56d0ccdab4 _value: {fileID: 5774385816057912484, guid: 2bc6f6a968d5ba04c919ba56d0ccdab4, type: 3} - - _key: HumanLiver + - _key: d75ff9a3ac207a84487ec1ee73a676fc _value: {fileID: 5774385816057912484, guid: d75ff9a3ac207a84487ec1ee73a676fc, type: 3} - - _key: HumanIntestineLarge + - _key: 1e304f9a331c2ba419514ef8afb8a13c _value: {fileID: 5774385816057912484, guid: 1e304f9a331c2ba419514ef8afb8a13c, type: 3} - - _key: HumanEye + - _key: 071581df025e1ba49a8a75eb39611ff6 _value: {fileID: 5774385816057912484, guid: 071581df025e1ba49a8a75eb39611ff6, type: 3} - - _key: HumanBrain + - _key: 7579883b8dd8801448a176adace4860b _value: {fileID: 5774385816057912484, guid: 7579883b8dd8801448a176adace4860b, type: 3} - - _key: Toolbelt + - _key: 40d904629802fc942860ce878e78efef _value: {fileID: 1080889307602868191, guid: 40d904629802fc942860ce878e78efef, type: 3} - - _key: Backpack + - _key: ddaa28fac1956b2428aff1dac1d89707 _value: {fileID: 802333698458937824, guid: ddaa28fac1956b2428aff1dac1d89707, type: 3} - - _key: HumanHeart + - _key: fccdc78a6cf916047ba52f2877f755e5 _value: {fileID: 2302397424301738637, guid: fccdc78a6cf916047ba52f2877f755e5, type: 3} - - _key: Doodad + - _key: f6528d8afa18fa14998a0158260ef26c _value: {fileID: 3792017003477948967, guid: f6528d8afa18fa14998a0158260ef26c, type: 3} - - _key: Wirecutters + - _key: 41a1c8c211dc32c4d8ffca5f0892f9dc _value: {fileID: 2402587210622244651, guid: 41a1c8c211dc32c4d8ffca5f0892f9dc, type: 3} - - _key: Multitool + - _key: 2ca5f2886cf2f19428b50bf284689b86 _value: {fileID: 2402587210622244651, guid: 2ca5f2886cf2f19428b50bf284689b86, type: 3} - - _key: PowerCellAdmin + - _key: c69ed93dc225ea049bbf1a02662c48c0 _value: {fileID: 7927487060350510867, guid: c69ed93dc225ea049bbf1a02662c48c0, type: 3} - - _key: PowerCell + - _key: de67200a4c96d444f800399a033ddfef _value: {fileID: 2402587210622244651, guid: de67200a4c96d444f800399a033ddfef, type: 3} - - _key: SteelWall + - _key: 45d13347efae0f54882e0e56dd770bb1 _value: {fileID: 3591147544166670882, guid: 45d13347efae0f54882e0e56dd770bb1, type: 3} - - _key: SteelGirder + - _key: 6c2559c2017ada740b245951a23c2e1d _value: {fileID: 3591147544166670882, guid: 6c2559c2017ada740b245951a23c2e1d, type: 3} - - _key: Plenum + - _key: 3b33b5cf16a677a4e85a110679cde32a _value: {fileID: 8028539322119499722, guid: 3b33b5cf16a677a4e85a110679cde32a, type: 3} - - _key: SteelGirderUnbolted + - _key: 5dba4171f2124fb48b0e32c0e10841e0 _value: {fileID: 3591147544166670882, guid: 5dba4171f2124fb48b0e32c0e10841e0, type: 3} - - _key: GlassReinforcedSheet + - _key: a1a7407e08bb2914c97f431063bf83e2 _value: {fileID: 7125681683583715523, guid: a1a7407e08bb2914c97f431063bf83e2, type: 3} - - _key: GlassSheet + - _key: e2a06f02e6a7e0348bdc535344bfe1f3 _value: {fileID: 7125681683583715523, guid: e2a06f02e6a7e0348bdc535344bfe1f3, type: 3} - - _key: WoodLog + - _key: 2767aeb6e6fd53b43a1cb305789834d4 _value: {fileID: 7125681683583715523, guid: 2767aeb6e6fd53b43a1cb305789834d4, type: 3} - - _key: WoodPlank + - _key: 4aee3fb97a6a2d442804c8c0b8347a92 _value: {fileID: 7125681683583715523, guid: 4aee3fb97a6a2d442804c8c0b8347a92, type: 3} - - _key: SteelRod + - _key: 48fa93e2da7acb3499e400becf2afc26 _value: {fileID: 7125681683583715523, guid: 48fa93e2da7acb3499e400becf2afc26, type: 3} - - _key: Welder + - _key: 06d944205e6b6dd489af078fa85fb878 _value: {fileID: 7393721560307922778, guid: 06d944205e6b6dd489af078fa85fb878, type: 3} - - _key: PlasmaTank + - _key: e3fb39f0a84acf541b6ee828550a1708 _value: {fileID: 7125681683583715523, guid: e3fb39f0a84acf541b6ee828550a1708, type: 3} - - _key: OxygenTank + - _key: 5479411218b869144b7d09d6db6dc58e _value: {fileID: 7125681683583715523, guid: 5479411218b869144b7d09d6db6dc58e, type: 3} - - _key: JumpsuitGrey + - _key: 236b51ddc6f9aa94ca92579082370c06 _value: {fileID: 624365323667193292, guid: 236b51ddc6f9aa94ca92579082370c06, type: 3} - - _key: JumpsuitSecurity + - _key: 93ad90421a3b2f64e8fdb9e95a42ba90 _value: {fileID: 6330158209413936013, guid: 93ad90421a3b2f64e8fdb9e95a42ba90, type: 3} - - _key: JumpsuitBotany + - _key: be3fcf1a74268ad49bfedb1edd9f5318 _value: {fileID: 8312388220934557560, guid: be3fcf1a74268ad49bfedb1edd9f5318, type: 3} - - _key: HumanIntestineSmall + - _key: 9c5418cbebef419429574992d3e296a3 _value: {fileID: 5774385816057912484, guid: 9c5418cbebef419429574992d3e296a3, type: 3} - - _key: GlassShard + - _key: 5cab1a9f6c7f74948b84d0d625319efe _value: {fileID: 7125681683583715523, guid: 5cab1a9f6c7f74948b84d0d625319efe, type: 3} - - _key: JumpsuitEngineer + - _key: 7436f4976849b994aaee40df1bca7d89 _value: {fileID: 4245634344425516727, guid: 7436f4976849b994aaee40df1bca7d89, type: 3} - - _key: MicroLaser + - _key: 84cec183559b4954c883b11f20f767c9 _value: {fileID: 2402587210622244651, guid: 84cec183559b4954c883b11f20f767c9, type: 3} - - _key: MatterBin + - _key: ed77d98d3e75b7946b404face1fe8f82 _value: {fileID: 2402587210622244651, guid: ed77d98d3e75b7946b404face1fe8f82, type: 3} - - _key: Medkit + - _key: 1e64a1c37be1f7c44a5d242d6ec6da10 _value: {fileID: 5533951594911835035, guid: 1e64a1c37be1f7c44a5d242d6ec6da10, type: 3} - - _key: HealthScanner + - _key: e9f99df80a74fd242aa46e53c7ec0376 _value: {fileID: 3794527162878356835, guid: e9f99df80a74fd242aa46e53c7ec0376, type: 3} - - _key: Hatchet + - _key: 9e967cb4084bf064c8a0ca5f57a33b0c _value: {fileID: 2402587210622244651, guid: 9e967cb4084bf064c8a0ca5f57a33b0c, type: 3} - - _key: ElectricalWire + - _key: cc71128d4bcc0c548ac11481000ac424 _value: {fileID: 7125681683583715523, guid: cc71128d4bcc0c548ac11481000ac424, type: 3} - - _key: ElectricalCable + - _key: 0e69918696f58e04f846e985ec7405fe _value: {fileID: 7125681683583715523, guid: 0e69918696f58e04f846e985ec7405fe, type: 3} - - _key: SteelWindow + - _key: b9c224febb4233f4e912745553097652 _value: {fileID: 3591147544166670882, guid: b9c224febb4233f4e912745553097652, type: 3} - - _key: SteelWallReinforced + - _key: abcc60752234e584d8d98c9dec03e7cc _value: {fileID: 3591147544166670882, guid: abcc60752234e584d8d98c9dec03e7cc, type: 3} - - _key: SteelWindowReinforced + - _key: f2493b5478dd8e946ba98861f533362e _value: {fileID: 3591147544166670882, guid: f2493b5478dd8e946ba98861f533362e, type: 3} - - _key: HeadsetSecurity + - _key: a38ee818c953a404787757d8d20d2851 _value: {fileID: 5049739216948387840, guid: a38ee818c953a404787757d8d20d2851, type: 3} - - _key: Headset + - _key: db15899bc1eb2794fb2b24129852a209 _value: {fileID: 8712940276313799639, guid: db15899bc1eb2794fb2b24129852a209, type: 3} - - _key: GloveInsulated + - _key: 65679cf5a30d6dd458666804af7c3ca3 _value: {fileID: 4581819739591165899, guid: 65679cf5a30d6dd458666804af7c3ca3, type: 3} - - _key: ShoeHiTops + - _key: 81faf4debf00a0a478b924176f48d011 _value: {fileID: 930591319891399865, guid: 81faf4debf00a0a478b924176f48d011, type: 3} - - _key: ShoeJackboots + - _key: 535ed7c02b5cbdc43ae2b234a963c5cc _value: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} _new: diff --git a/Assets/Content/Data/Databases/Materials.asset b/Assets/Content/Data/Databases/Materials.asset index b4183d2f1f..d86162248e 100644 --- a/Assets/Content/Data/Databases/Materials.asset +++ b/Assets/Content/Data/Databases/Materials.asset @@ -13,13 +13,14 @@ MonoBehaviour: m_Name: Materials m_EditorClassIdentifier: DatabaseName: Materials + DatabaseID: acbbffb4c89caec469bb21b6197c7626 AssetGroup: {fileID: 11400000, guid: 2caa591261a883b4183d04829ce705fd, type: 2} Assets: _list: - - _key: DeleteConstruction + - _key: ed5a1263eb564c94abc6407ac0919ea7 _value: {fileID: 2100000, guid: ed5a1263eb564c94abc6407ac0919ea7, type: 2} - - _key: InvalidConstruction + - _key: e9b99cfb2e59ffa40a062c2f4b88b729 _value: {fileID: 2100000, guid: e9b99cfb2e59ffa40a062c2f4b88b729, type: 2} - - _key: ValidConstruction + - _key: 6d2a18aa72cbaf94694dce9f8451160b _value: {fileID: 2100000, guid: 6d2a18aa72cbaf94694dce9f8451160b, type: 2} _new: diff --git a/Assets/Content/Data/Databases/ParticlesEffects.asset b/Assets/Content/Data/Databases/ParticlesEffects.asset index 7ea24935f7..9b7ad69141 100644 --- a/Assets/Content/Data/Databases/ParticlesEffects.asset +++ b/Assets/Content/Data/Databases/ParticlesEffects.asset @@ -13,13 +13,14 @@ MonoBehaviour: m_Name: ParticlesEffects m_EditorClassIdentifier: DatabaseName: ParticlesEffects + DatabaseID: 099b9943e9299d54b82d2c1163500458 AssetGroup: {fileID: 11400000, guid: d700978032e12a647b8734863a0bf7c2, type: 2} Assets: _list: - - _key: AttackParticles + - _key: 17b0d9163e9cdf14aa557557e7d9d76b _value: {fileID: 7714517724079113232, guid: 17b0d9163e9cdf14aa557557e7d9d76b, type: 3} - - _key: BleedingParticle + - _key: a6a77c26ee7edd94c804f4ddd851c8ba _value: {fileID: 6016476664605660376, guid: a6a77c26ee7edd94c804f4ddd851c8ba, type: 3} - - _key: ConstructionParticle + - _key: ca5e6b5f7c6c5054a8f8155ef44e3e43 _value: {fileID: 9126258469831405173, guid: ca5e6b5f7c6c5054a8f8155ef44e3e43, type: 3} _new: diff --git a/Assets/Content/Data/Databases/Sounds.asset b/Assets/Content/Data/Databases/Sounds.asset index 0a1a8ed441..069bcbf765 100644 --- a/Assets/Content/Data/Databases/Sounds.asset +++ b/Assets/Content/Data/Databases/Sounds.asset @@ -13,29 +13,30 @@ MonoBehaviour: m_Name: Sounds m_EditorClassIdentifier: DatabaseName: Sounds + DatabaseID: 43b69e36c49203a44bf20042cd83de81 AssetGroup: {fileID: 11400000, guid: d640c8e212e7a5349999a9ddd6ffb5b5, type: 2} Assets: _list: - - _key: BikeHorn + - _key: 8c8823796bbcb23438fcf68260070383 _value: {fileID: 8300000, guid: 8c8823796bbcb23438fcf68260070383, type: 3} - - _key: Title1 + - _key: ec8b849764a7e9147b2a565f81a1ca42 _value: {fileID: 8300000, guid: ec8b849764a7e9147b2a565f81a1ca42, type: 3} - - _key: Title2 + - _key: 3f51862f0b88a5243a8cceb97147489d _value: {fileID: 8300000, guid: 3f51862f0b88a5243a8cceb97147489d, type: 3} - - _key: Title3 + - _key: fd331e360db5fbb448e66367e41d1893 _value: {fileID: 8300000, guid: fd331e360db5fbb448e66367e41d1893, type: 3} - - _key: Can1 + - _key: 1a34c805f84be3b4caac14d7de790607 _value: {fileID: 8300000, guid: 1a34c805f84be3b4caac14d7de790607, type: 3} - - _key: Can2 + - _key: 8d93fdf9dcada204a952e29213f0293f _value: {fileID: 8300000, guid: 8d93fdf9dcada204a952e29213f0293f, type: 3} - - _key: Can3 + - _key: b315c4abdef36244fb211c5f643d411a _value: {fileID: 8300000, guid: b315c4abdef36244fb211c5f643d411a, type: 3} - - _key: Can4 + - _key: f00c6b5a098e84b4b87d80d23b4f295a _value: {fileID: 8300000, guid: f00c6b5a098e84b4b87d80d23b4f295a, type: 3} - - _key: AirlockClose + - _key: fc2485e75c5d3ab4e86e814043c9e9cb _value: {fileID: 8300000, guid: fc2485e75c5d3ab4e86e814043c9e9cb, type: 3} - - _key: AirlockOpen + - _key: 34297ba204a9f3944872f100baaa2369 _value: {fileID: 8300000, guid: 34297ba204a9f3944872f100baaa2369, type: 3} - - _key: FuelPowerGenerator + - _key: 59b65ecaf8dffbf49876ab2768490b59 _value: {fileID: 8300000, guid: 59b65ecaf8dffbf49876ab2768490b59, type: 3} _new: diff --git a/Assets/Content/Data/Databases/WorldSpaceUI.asset b/Assets/Content/Data/Databases/WorldSpaceUI.asset index bb5ead4974..4055595dd7 100644 --- a/Assets/Content/Data/Databases/WorldSpaceUI.asset +++ b/Assets/Content/Data/Databases/WorldSpaceUI.asset @@ -13,9 +13,10 @@ MonoBehaviour: m_Name: WorldSpaceUI m_EditorClassIdentifier: DatabaseName: WorldSpaceUI + DatabaseID: 830650063081cdf4d90087fc2ac74d24 AssetGroup: {fileID: 11400000, guid: dd394b793b56e43418a2c11a61130663, type: 2} Assets: _list: - - _key: LoadingBar + - _key: 03bcc1824d3b20748b912ca532f86bb9 _value: {fileID: 1998198171871307260, guid: 03bcc1824d3b20748b912ca532f86bb9, type: 3} _new: diff --git a/Assets/Content/Data/Roles/Assistant.asset b/Assets/Content/Data/Roles/Assistant.asset index 1fa6f33e8e..3c8f38810c 100644 --- a/Assets/Content/Data/Roles/Assistant.asset +++ b/Assets/Content/Data/Roles/Assistant.asset @@ -13,8 +13,8 @@ MonoBehaviour: m_Name: Assistant m_EditorClassIdentifier: _roleName: Assistant - _pdaPrefab: {fileID: 5261116577612792016, guid: 2a63163a4db141744a802f3ff67087db, type: 3} - _idCardPrefab: {fileID: 5261116577612792016, guid: ff95abc9c2b779340a1b50f1a128a934, type: 3} + _pdaAsset: {fileID: 11400000, guid: 4f09dc7f882c18542b750da80a29720f, type: 2} + _idCardAsset: {fileID: 11400000, guid: bca8d36802b3dbc47bc479151a3f7ea1, type: 2} _permissions: - {fileID: 11400000, guid: 921240e0c27686d4eaf2ff761944c5eb, type: 2} _loadout: {fileID: 11400000, guid: 5db09cbd548ecf34f97473fb3898e95e, type: 2} diff --git a/Assets/Content/Data/Roles/Loadouts/AssistantLoadout.asset b/Assets/Content/Data/Roles/Loadouts/AssistantLoadout.asset index 4bd6002105..4465471d69 100644 --- a/Assets/Content/Data/Roles/Loadouts/AssistantLoadout.asset +++ b/Assets/Content/Data/Roles/Loadouts/AssistantLoadout.asset @@ -12,18 +12,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fbd6da0c74d76746b141068081e0dc3, type: 3} m_Name: AssistantLoadout m_EditorClassIdentifier: - HandLeft: {fileID: 5533951594911835035, guid: 264ea51d92067c14ebc6633999afac78, type: 3} - HandRight: {fileID: 0} - Equipment: + HandLeftAsset: {fileID: 11400000, guid: 734468cf273e2144d945698e4793b7c5, type: 2} + HandRightAsset: {fileID: 0} + EquipmentAssets: _list: - _key: 512 - _value: {fileID: 624365323667193292, guid: 236b51ddc6f9aa94ca92579082370c06, type: 3} + _value: {fileID: 11400000, guid: 620dc53a5608be44a975c990e69ddba5, type: 2} - _key: 16 - _value: {fileID: 6003340987905195654, guid: 5fa15d6fdef93dc4e80d798cefe8be0b, type: 3} + _value: {fileID: 0} - _key: 32 - _value: {fileID: 930591319891399865, guid: 317ec7dcff3b11d4eae3a47929200b93, type: 3} + _value: {fileID: 0} - _key: 2048 - _value: {fileID: 4581819739591165899, guid: 65679cf5a30d6dd458666804af7c3ca3, type: 3} + _value: {fileID: 11400000, guid: 55deb25596d5d314b8b7dd58eafb8aec, type: 2} - _key: 4096 - _value: {fileID: 4581819739591165899, guid: 65679cf5a30d6dd458666804af7c3ca3, type: 3} + _value: {fileID: 11400000, guid: 55deb25596d5d314b8b7dd58eafb8aec, type: 2} _new: 0 diff --git a/Assets/Content/Data/Roles/Loadouts/SecurityLoadout.asset b/Assets/Content/Data/Roles/Loadouts/SecurityLoadout.asset index 8f9c04c3d6..6a2dee2db5 100644 --- a/Assets/Content/Data/Roles/Loadouts/SecurityLoadout.asset +++ b/Assets/Content/Data/Roles/Loadouts/SecurityLoadout.asset @@ -12,14 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fbd6da0c74d76746b141068081e0dc3, type: 3} m_Name: SecurityLoadout m_EditorClassIdentifier: - HandLeft: {fileID: 8197868818743549203, guid: 1d2cf546d53e3fe4c9103007427aaec7, type: 3} - HandRight: {fileID: 0} - Equipment: + HandLeftAsset: {fileID: 11400000, guid: d81d46f903aad014aa4728a8b47ab7ea, type: 2} + HandRightAsset: {fileID: 0} + EquipmentAssets: _list: - _key: 512 - _value: {fileID: 624365323667193292, guid: 236b51ddc6f9aa94ca92579082370c06, type: 3} + _value: {fileID: 11400000, guid: 620dc53a5608be44a975c990e69ddba5, type: 2} - _key: 16 - _value: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} + _value: {fileID: 11400000, guid: 7514f2bc5fd84a14095929761da0a4dd, type: 2} - _key: 32 - _value: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} + _value: {fileID: 11400000, guid: 7514f2bc5fd84a14095929761da0a4dd, type: 2} _new: 0 diff --git a/Assets/Content/Data/Roles/Security.asset b/Assets/Content/Data/Roles/Security.asset index a0cf26684f..e410b68a42 100644 --- a/Assets/Content/Data/Roles/Security.asset +++ b/Assets/Content/Data/Roles/Security.asset @@ -13,8 +13,8 @@ MonoBehaviour: m_Name: Security m_EditorClassIdentifier: _roleName: Security - _pdaPrefab: {fileID: 5261116577612792016, guid: 79260483ae5d3e04fa272e092b49abac, type: 3} - _idCardPrefab: {fileID: 5261116577612792016, guid: d8b0c8d1ddcdeb24d9763054c103c9fe, type: 3} + _pdaAsset: {fileID: 11400000, guid: 4773cbe0a88c809459547e0d0eff8d29, type: 2} + _idCardAsset: {fileID: 11400000, guid: d4a76ab7d8dbea34cb528fc2b784fd70, type: 2} _permissions: - {fileID: 11400000, guid: 921240e0c27686d4eaf2ff761944c5eb, type: 2} - {fileID: 11400000, guid: 6f6e80ff9f87f7e4d810b2e9dcb013df, type: 2} diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset b/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset index 23c97a15eb..9860062ae2 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: AttackParticles m_EditorClassIdentifier: - Id: AttackParticles - Database: ParticlesEffects + Id: 17b0d9163e9cdf14aa557557e7d9d76b + Database: 099b9943e9299d54b82d2c1163500458 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset b/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset index 63a7906cf5..f9878d4de9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Backpack m_EditorClassIdentifier: - Id: Backpack - Database: Items + Id: ddaa28fac1956b2428aff1dac1d89707 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset b/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset index f9fd133c1e..3804b568c9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: BikeHorn m_EditorClassIdentifier: - Id: BikeHorn - Database: Items + Id: 11f824c472e04854e95065dda095e8f4 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset b/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset index 280dba0a65..0221020758 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: BleedingParticle m_EditorClassIdentifier: - Id: BleedingParticle - Database: ParticlesEffects + Id: a6a77c26ee7edd94c804f4ddd851c8ba + Database: 099b9943e9299d54b82d2c1163500458 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset b/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset index ff4c1d6b63..b2b9499d27 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Boombox m_EditorClassIdentifier: - Id: Boombox - Database: Items + Id: 1d2cf546d53e3fe4c9103007427aaec7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset b/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset index 0efc57064b..23d1c331c3 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: BrutePatch m_EditorClassIdentifier: - Id: BrutePatch - Database: Items + Id: b5be0a52925e2674193d081d2deb68cb + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset b/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset index a8ba9ff89e..74b8e114f5 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: BurnPatch m_EditorClassIdentifier: - Id: BurnPatch - Database: Items + Id: 162e188d33a82b440a239f20901c716a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset b/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset index 5e9a0be325..8867836a66 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ConstructionParticle m_EditorClassIdentifier: - Id: ConstructionParticle - Database: ParticlesEffects + Id: ca5e6b5f7c6c5054a8f8155ef44e3e43 + Database: 099b9943e9299d54b82d2c1163500458 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset b/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset index 0f5f70b711..cdef477070 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Crowbar m_EditorClassIdentifier: - Id: Crowbar - Database: Items + Id: 7becfab153276864f9fc7636a839d837 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset b/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset index 65a33b9f0c..2cd1e794fd 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: DonkPocket m_EditorClassIdentifier: - Id: DonkPocket - Database: Items + Id: 56b1aff2041026242bed0f064dee56bb + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset b/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset index e82026634c..b3c3e90b7a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Doodad m_EditorClassIdentifier: - Id: Doodad - Database: Items + Id: f6528d8afa18fa14998a0158260ef26c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset b/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset index 8a50e187ca..b4be80ba0d 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ElectricalCable m_EditorClassIdentifier: - Id: ElectricalCable - Database: Items + Id: 0e69918696f58e04f846e985ec7405fe + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset b/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset index fa08374ee3..9b6758ff50 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ElectricalWire m_EditorClassIdentifier: - Id: ElectricalWire - Database: Items + Id: cc71128d4bcc0c548ac11481000ac424 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset b/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset index f23b2967fc..21661b8478 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: FacewearGasMask m_EditorClassIdentifier: - Id: FacewearGasMask - Database: Items + Id: bf177f8bab26bc84b87fd9a971004418 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset index 9c84be4ebe..4fc9dd29d6 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: FlashlightBlue m_EditorClassIdentifier: - Id: FlashlightBlue - Database: Items + Id: 781dd9024aaa53444bc3deeaa9708fbb + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset b/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset index f9f41cda7b..5087352918 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: FloorTile m_EditorClassIdentifier: - Id: FloorTile - Database: Items + Id: 404443f7c306fc8469698745624fa3bf + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset b/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset index 61ac090c97..2624297d45 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: GlassReinforcedSheet m_EditorClassIdentifier: - Id: GlassReinforcedSheet - Database: Items + Id: a1a7407e08bb2914c97f431063bf83e2 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset b/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset index 95ff84f3a1..60d0f16a84 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: GlassShard m_EditorClassIdentifier: - Id: GlassShard - Database: Items + Id: 5cab1a9f6c7f74948b84d0d625319efe + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset b/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset index 8f82f6f7b1..9a0c593817 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: GlassSheet m_EditorClassIdentifier: - Id: GlassSheet - Database: Items + Id: e2a06f02e6a7e0348bdc535344bfe1f3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset b/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset index a8447acd38..c436dc3d83 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: GloveInsulated m_EditorClassIdentifier: - Id: GloveInsulated - Database: Items + Id: 65679cf5a30d6dd458666804af7c3ca3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset b/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset index a0f1eb66e1..2a8a2355ee 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Hatchet m_EditorClassIdentifier: - Id: Hatchet - Database: Items + Id: 9e967cb4084bf064c8a0ca5f57a33b0c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset b/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset index 5ddfe16e13..0e6779c55f 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Headset m_EditorClassIdentifier: - Id: Headset - Database: Items + Id: db15899bc1eb2794fb2b24129852a209 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset b/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset index db3ffa706f..44a8edcba5 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HeadsetSecurity m_EditorClassIdentifier: - Id: HeadsetSecurity - Database: Items + Id: a38ee818c953a404787757d8d20d2851 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset b/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset index 5f285d9840..922c8cd564 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HealthScanner m_EditorClassIdentifier: - Id: HealthScanner - Database: Items + Id: e9f99df80a74fd242aa46e53c7ec0376 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset index afec869cd4..f1a117d87e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanArmLeft m_EditorClassIdentifier: - Id: HumanArmLeft - Database: Items + Id: 06b6be83779804245b7f6411fe07b851 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset index ccb75ddae5..6bb6b9ce9e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanArmRight m_EditorClassIdentifier: - Id: HumanArmRight - Database: Items + Id: 432a4ad70e41e5c4f8f913f76fe0e66c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset index 039f6ca27b..fd54f6f93e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanBrain m_EditorClassIdentifier: - Id: HumanBrain - Database: Items + Id: 7579883b8dd8801448a176adace4860b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset index f0711f986b..f73344e923 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanEarLeft m_EditorClassIdentifier: - Id: HumanEarLeft - Database: Items + Id: e02f11b9239b52748a5ed5afd1c5cbd3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset index 28ae2a9d30..37dfa923fb 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanEarRight m_EditorClassIdentifier: - Id: HumanEarRight - Database: Items + Id: 30794a01d5f4c174a9d20b2c632f2dca + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset index b123a96ebc..ac28b82d24 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanEye m_EditorClassIdentifier: - Id: HumanEye - Database: Items + Id: 071581df025e1ba49a8a75eb39611ff6 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset index 6b830cb663..90933aaae8 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanFootLeft m_EditorClassIdentifier: - Id: HumanFootLeft - Database: Items + Id: 94aaf82bb6ab002418e01d9cc7c6eaaa + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset index 59e72ea3a1..a0c13ff67c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanFootRight m_EditorClassIdentifier: - Id: HumanFootRight - Database: Items + Id: e60ba1e09be8316448e419ecbdfb64a6 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset index 5e36e9d9a3..2cd5def074 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanHandLeft m_EditorClassIdentifier: - Id: HumanHandLeft - Database: Items + Id: 35dfc7c3f708a5b48a206b4a44e7ab49 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset index 304fe58984..5736c97dfb 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanHandRight m_EditorClassIdentifier: - Id: HumanHandRight - Database: Items + Id: 7f5954f009d06b2439ca637b43920440 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset index 3658260799..ae9343115d 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanHead m_EditorClassIdentifier: - Id: HumanHead - Database: Items + Id: cc54bc74b2f4c2349b1f84b501b0a091 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset index 003cb0b298..7476985f1d 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanHeart m_EditorClassIdentifier: - Id: HumanHeart - Database: Items + Id: fccdc78a6cf916047ba52f2877f755e5 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset index eea72af90e..2c821e4313 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanIntestineLarge m_EditorClassIdentifier: - Id: HumanIntestineLarge - Database: Items + Id: 1e304f9a331c2ba419514ef8afb8a13c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset index a168c3986c..e52592730a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanIntestineSmall m_EditorClassIdentifier: - Id: HumanIntestineSmall - Database: Items + Id: 9c5418cbebef419429574992d3e296a3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset index e27bd98c49..a3932977a9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLegLeft m_EditorClassIdentifier: - Id: HumanLegLeft - Database: Items + Id: ecaf79b0a74bdb443a350e88daa94a66 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset index beb1a64456..1b11c420ca 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLegRight m_EditorClassIdentifier: - Id: HumanLegRight - Database: Items + Id: 242a937784a622f4f8a6e6d097e0737c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset index 38163e511e..9092714b85 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLiver m_EditorClassIdentifier: - Id: HumanLiver - Database: Items + Id: d75ff9a3ac207a84487ec1ee73a676fc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset index 8fe274f469..0b1d49f0fb 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLungLeft m_EditorClassIdentifier: - Id: HumanLungLeft - Database: Items + Id: a019475d05ec8824494b0fa88e2282d8 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset index 14c37c0f2d..cb5329f29e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanLungRight m_EditorClassIdentifier: - Id: HumanLungRight - Database: Items + Id: a8b265034e3f79344a6067b406e1bff6 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset index c3d54065fd..af3bf0e802 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanStomach m_EditorClassIdentifier: - Id: HumanStomach - Database: Items + Id: 2bc6f6a968d5ba04c919ba56d0ccdab4 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset b/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset index 6b8f71367f..ac939e883e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: HumanTorso m_EditorClassIdentifier: - Id: HumanTorso - Database: Items + Id: 4a9d34a6cf84ef045a740513d8ae30b1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset b/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset index 885e41126f..97cd875dd2 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: IDCard m_EditorClassIdentifier: - Id: IDCard - Database: Items + Id: d8b0c8d1ddcdeb24d9763054c103c9fe + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset index f5b59f594e..128352d080 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: JumpsuitBotany m_EditorClassIdentifier: - Id: JumpsuitBotany - Database: Items + Id: be3fcf1a74268ad49bfedb1edd9f5318 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset index 6f7a00648b..cafd2d87a0 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: JumpsuitEngineer m_EditorClassIdentifier: - Id: JumpsuitEngineer - Database: Items + Id: 7436f4976849b994aaee40df1bca7d89 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset index 04574d540a..844bb05e19 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: JumpsuitGrey m_EditorClassIdentifier: - Id: JumpsuitGrey - Database: Items + Id: 236b51ddc6f9aa94ca92579082370c06 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset index 61142149ba..10de8fb3fa 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: JumpsuitSecurity m_EditorClassIdentifier: - Id: JumpsuitSecurity - Database: Items + Id: 93ad90421a3b2f64e8fdb9e95a42ba90 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset b/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset index 9d68fb0950..38aff79a86 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: KitchenKnife m_EditorClassIdentifier: - Id: KitchenKnife - Database: Items + Id: 411b513efc8f06a40aecfc47d0c5fc5a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset b/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset index 9f056f5031..e9e41ffa1c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: LoadingBar m_EditorClassIdentifier: - Id: LoadingBar - Database: WorldSpaceUI + Id: 03bcc1824d3b20748b912ca532f86bb9 + Database: 830650063081cdf4d90087fc2ac74d24 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset b/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset index e7d88ddbf2..f02c79dd8e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: MatterBin m_EditorClassIdentifier: - Id: MatterBin - Database: Items + Id: ed77d98d3e75b7946b404face1fe8f82 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset b/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset index bef782a656..6590be503d 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: MedicalPatch m_EditorClassIdentifier: - Id: MedicalPatch - Database: Items + Id: 2332a158259900e4f8a237fa8daff266 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset b/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset index 59be73132a..2275147449 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Medkit m_EditorClassIdentifier: - Id: Medkit - Database: Items + Id: 1e64a1c37be1f7c44a5d242d6ec6da10 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset b/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset index 6f1ab169aa..6f044144c9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: MicroLaser m_EditorClassIdentifier: - Id: MicroLaser - Database: Items + Id: 84cec183559b4954c883b11f20f767c9 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset b/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset index aa04f3d969..ffc349c425 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Mug m_EditorClassIdentifier: - Id: Mug - Database: Items + Id: d9aabfd5d726a7f499b8e360d919eba4 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset b/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset index 9e6f88019b..207f652305 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Multitool m_EditorClassIdentifier: - Id: Multitool - Database: Items + Id: 2ca5f2886cf2f19428b50bf284689b86 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset b/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset index c0d751168a..92ba6a075c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: NuclearAuthenticationDisk m_EditorClassIdentifier: - Id: NuclearAuthenticationDisk - Database: Items + Id: 1ae18785d74e9fa4699b6f6de889c243 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset b/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset index 80bc0fec1c..fedc2bfd1c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: OxygenTank m_EditorClassIdentifier: - Id: OxygenTank - Database: Items + Id: 5479411218b869144b7d09d6db6dc58e + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset b/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset index 3859976b65..a41548f2ce 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: PDA m_EditorClassIdentifier: - Id: PDA - Database: Items + Id: 79260483ae5d3e04fa272e092b49abac + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset b/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset index 8f97cf9996..c64b03aab0 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: PlasmaTank m_EditorClassIdentifier: - Id: PlasmaTank - Database: Items + Id: e3fb39f0a84acf541b6ee828550a1708 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset b/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset index 0b8114d471..7c4c1d8fdd 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Plenum m_EditorClassIdentifier: - Id: Plenum - Database: Items + Id: 3b33b5cf16a677a4e85a110679cde32a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset b/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset index 8229464a46..8390642f52 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Poster m_EditorClassIdentifier: - Id: Poster - Database: Items + Id: b044d7bdb55405046a9055726a779eb1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset b/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset index b33a287d0a..032759dbf7 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: PowerCell m_EditorClassIdentifier: - Id: PowerCell - Database: Items + Id: de67200a4c96d444f800399a033ddfef + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset index 355bac5fdf..1719640dc3 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: PowerCellAdmin m_EditorClassIdentifier: - Id: PowerCellAdmin - Database: Items + Id: c69ed93dc225ea049bbf1a02662c48c0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset index 232e54630b..32784b2c5a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ScrewdriverBlue m_EditorClassIdentifier: - Id: ScrewdriverBlue - Database: Items + Id: 9c8363ee7f934bd4b8ee5a2e30da1269 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset b/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset index 30de5d5e20..d929f94b18 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SecurityIDCard m_EditorClassIdentifier: - Id: SecurityIDCard - Database: Items + Id: ff95abc9c2b779340a1b50f1a128a934 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset b/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset index 4bba12839e..d6370d3cf5 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SecurityPDA m_EditorClassIdentifier: - Id: SecurityPDA - Database: Items + Id: 2a63163a4db141744a802f3ff67087db + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset b/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset index cde406ba96..af3b50b085 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ShoeHiTops m_EditorClassIdentifier: - Id: ShoeHiTops - Database: Items + Id: 81faf4debf00a0a478b924176f48d011 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset b/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset index 6fc128c8ca..e826d99435 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ShoeJackboots m_EditorClassIdentifier: - Id: ShoeJackboots - Database: Items + Id: 535ed7c02b5cbdc43ae2b234a963c5cc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset index e9d92f4692..7a57114807 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanBeepsSoda m_EditorClassIdentifier: - Id: SodaCanBeepsSoda - Database: Items + Id: f490a74616c067c4f83995017e10b420 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset index 19dba3b2d9..128f681985 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanBeepyLime m_EditorClassIdentifier: - Id: SodaCanBeepyLime - Database: Items + Id: 4e6899916bc8fd742a07f32b3a04de12 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset index 0da19ffabe..9dbebb707c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanCannedAir m_EditorClassIdentifier: - Id: SodaCanCannedAir - Database: Items + Id: e4281cb43d1443d4388737777fdd98d8 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset index b603e8ff15..61f82e5a43 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanCannedLaughter m_EditorClassIdentifier: - Id: SodaCanCannedLaughter - Database: Items + Id: dceb056e41b5c634f9933423de8e075c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset index c520aeb465..86832f57f7 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanCola m_EditorClassIdentifier: - Id: SodaCanCola - Database: Items + Id: 92d6696a323ef66448190e8e9d69fd22 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset index 1ca5f38a04..443d58d21a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanDukePurpleTea m_EditorClassIdentifier: - Id: SodaCanDukePurpleTea - Database: Items + Id: 177428b73bad0fb4a89d1a64b85629bf + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset index 7c44577f01..bfcf797d06 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SodaCanTonic m_EditorClassIdentifier: - Id: SodaCanTonic - Database: Items + Id: a7c35693adae32f43b4d7fe2eb8b091b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset index 26f9f3036e..df561cda9c 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelGirder m_EditorClassIdentifier: - Id: SteelGirder - Database: Items + Id: 6c2559c2017ada740b245951a23c2e1d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset index d2f163e741..be5edf0373 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelGirderUnbolted m_EditorClassIdentifier: - Id: SteelGirderUnbolted - Database: Items + Id: 5dba4171f2124fb48b0e32c0e10841e0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset index 531d1e0fb7..f0b0b6db7a 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelReinforcedSheet m_EditorClassIdentifier: - Id: SteelReinforcedSheet - Database: Items + Id: f88a398ad3d01454f955de9c337d9b99 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset index 4b3552e5e3..78de8806ba 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelRod m_EditorClassIdentifier: - Id: SteelRod - Database: Items + Id: 48fa93e2da7acb3499e400becf2afc26 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset index 7618cc42bf..5cab587832 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelSheet m_EditorClassIdentifier: - Id: SteelSheet - Database: Items + Id: 4cb99cf2fee96f944abbacc51b0b701c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset index 05cc52974d..63b42b53dd 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelWall m_EditorClassIdentifier: - Id: SteelWall - Database: Items + Id: 45d13347efae0f54882e0e56dd770bb1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset index 7f29112d85..b6aec5625b 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelWallReinforced m_EditorClassIdentifier: - Id: SteelWallReinforced - Database: Items + Id: abcc60752234e584d8d98c9dec03e7cc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset index ff9af43bdc..21f63e67a9 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelWindow m_EditorClassIdentifier: - Id: SteelWindow - Database: Items + Id: b9c224febb4233f4e912745553097652 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset b/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset index 5761dcf824..41694ea843 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: SteelWindowReinforced m_EditorClassIdentifier: - Id: SteelWindowReinforced - Database: Items + Id: f2493b5478dd8e946ba98861f533362e + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset b/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset index e7928e8ecd..3341624915 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Sunglasses m_EditorClassIdentifier: - Id: Sunglasses - Database: Items + Id: 9b9f6bd470226a74b903e74dbe9e423a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset b/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset index ba4d490504..27f95f1863 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Toolbelt m_EditorClassIdentifier: - Id: Toolbelt - Database: Items + Id: 40d904629802fc942860ce878e78efef + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset index e6fde2669e..4e29fffc4b 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: ToolboxBlue m_EditorClassIdentifier: - Id: ToolboxBlue - Database: Items + Id: 264ea51d92067c14ebc6633999afac78 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset b/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset index f131902ee1..b1b997ab82 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: TruckerCap m_EditorClassIdentifier: - Id: TruckerCap - Database: Items + Id: 1ef3c21a685ec2d4e9f0876719839d5f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset b/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset index bc1c0f8736..f5c33e4057 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Welder m_EditorClassIdentifier: - Id: Welder - Database: Items + Id: 06d944205e6b6dd489af078fa85fb878 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset b/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset index 5335f85a34..d9106d7491 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Wirecutters m_EditorClassIdentifier: - Id: Wirecutters - Database: Items + Id: 41a1c8c211dc32c4d8ffca5f0892f9dc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset b/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset index eecbb8b2e7..ffaf918a63 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: WoodLog m_EditorClassIdentifier: - Id: WoodLog - Database: Items + Id: 2767aeb6e6fd53b43a1cb305789834d4 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset b/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset index 6183582c2a..29c43cc052 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: WoodPlank m_EditorClassIdentifier: - Id: WoodPlank - Database: Items + Id: 4aee3fb97a6a2d442804c8c0b8347a92 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset b/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset index a1b5fc7ca0..74d8d9c18e 100644 --- a/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset +++ b/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} m_Name: Wrench m_EditorClassIdentifier: - Id: Wrench - Database: Items + Id: 772da386eb7b01745913050fee544c32 + Database: c2644d7b34e956743a0bc485e7ca5e37 From f970e1e487efedfe8fedc8063dda5a3a8c2c41e9 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Mon, 2 Feb 2026 16:38:47 -0500 Subject: [PATCH 31/54] Add new asset files and update prefab references for audio management --- .../WorldObjectAssetReferences/Can1.asset | 16 ++++++ .../Can1.asset.meta | 8 +++ .../WorldObjectAssetReferences/Can2.asset | 16 ++++++ .../Can2.asset.meta | 8 +++ .../WorldObjectAssetReferences/Can3.asset | 16 ++++++ .../Can3.asset.meta | 8 +++ .../WorldObjectAssetReferences/Can4.asset | 16 ++++++ .../Can4.asset.meta | 8 +++ .../WorldObjectAssetReferences/Title1.asset | 16 ++++++ .../Title1.asset.meta | 8 +++ .../WorldObjectAssetReferences/Title2.asset | 16 ++++++ .../Title2.asset.meta | 8 +++ .../WorldObjectAssetReferences/Title3.asset | 16 ++++++ .../Title3.asset.meta | 8 +++ .../Furniture/Generic/JukeboxBlueGreen.prefab | 10 ++-- .../Food/Drinks/Soda/SodaCanGeneric.prefab | 6 +++ .../WorldObjectAssetReference.cs | 36 +++++++++++++- .../SS3D/Systems/Audio/AudioSubSystem.cs | 49 ++++++++++++++++--- Assets/Scripts/SS3D/Systems/Audio/Boombox.cs | 9 ++-- .../SS3D/Systems/Audio/NoisyCollision.cs | 33 ++++++++----- .../Systems/Electricity/FuelPowerGenerator.cs | 3 +- .../Systems/Furniture/AirlockStateMachine.cs | 6 +-- .../SS3D/Systems/Furniture/VendingMachine.cs | 6 +-- .../Inventory/Items/Generic/BikeHorn.cs | 3 +- 24 files changed, 289 insertions(+), 40 deletions(-) create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can1.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can2.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can3.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can4.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title1.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title2.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title3.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset b/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset new file mode 100644 index 0000000000..198a494a11 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Can1 + m_EditorClassIdentifier: + Id: 1a34c805f84be3b4caac14d7de790607 + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta new file mode 100644 index 0000000000..0099d65304 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a018567162ec7ad40bdd2d7d8ae6074b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset b/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset new file mode 100644 index 0000000000..0f3cd2d812 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Can2 + m_EditorClassIdentifier: + Id: 8d93fdf9dcada204a952e29213f0293f + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta new file mode 100644 index 0000000000..d29b2da515 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d6d1f8ffca30774e8791de6a68f2d97 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset b/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset new file mode 100644 index 0000000000..e92ed62491 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Can3 + m_EditorClassIdentifier: + Id: b315c4abdef36244fb211c5f643d411a + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta new file mode 100644 index 0000000000..8ff93733fa --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b30cc2cc7d13a7f459a5911da388787f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset b/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset new file mode 100644 index 0000000000..9a061f1f1e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Can4 + m_EditorClassIdentifier: + Id: f00c6b5a098e84b4b87d80d23b4f295a + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta new file mode 100644 index 0000000000..864bfc17a2 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4cac36cceddb62f4c914372c095706e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset b/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset new file mode 100644 index 0000000000..8f9fc16c93 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Title1 + m_EditorClassIdentifier: + Id: ec8b849764a7e9147b2a565f81a1ca42 + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta new file mode 100644 index 0000000000..e0b22dd52e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25feb284497d72e419a785e18fd7e290 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset b/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset new file mode 100644 index 0000000000..a2a2afbde0 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Title2 + m_EditorClassIdentifier: + Id: 3f51862f0b88a5243a8cceb97147489d + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta new file mode 100644 index 0000000000..f9fc52eb18 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5f3cdceb1529134a986e01cfa0d66a0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset b/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset new file mode 100644 index 0000000000..ab7fd0edd2 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Title3 + m_EditorClassIdentifier: + Id: fd331e360db5fbb448e66367e41d1893 + Database: 43b69e36c49203a44bf20042cd83de81 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta new file mode 100644 index 0000000000..e690a9b1e3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09d1c5fc70b293a4ab1411d9636b6f01 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab b/Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab index f3fabbe1a3..221153c79f 100644 --- a/Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab +++ b/Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab @@ -154,11 +154,11 @@ MonoBehaviour: _addedNetworkObject: {fileID: 4294524822034227355} _networkObjectCache: {fileID: 4294524822034227355} _powerConsumer: {fileID: 8272970134100573020} - _songs: - - {fileID: 8300000, guid: ec8b849764a7e9147b2a565f81a1ca42, type: 3} - - {fileID: 8300000, guid: fd331e360db5fbb448e66367e41d1893, type: 3} - - {fileID: 8300000, guid: 3f51862f0b88a5243a8cceb97147489d, type: 3} - RadioOn: 0 + _songReferences: + - {fileID: 11400000, guid: 25feb284497d72e419a785e18fd7e290, type: 2} + - {fileID: 11400000, guid: 09d1c5fc70b293a4ab1411d9636b6f01, type: 2} + - {fileID: 11400000, guid: f5f3cdceb1529134a986e01cfa0d66a0, type: 2} + AudioOn: 0 CurrentMusic: 0 InteractionIcon: {fileID: 21300000, guid: d1f34343e08a14e48a856e409c355f32, type: 3} InteractionIconOn: {fileID: 0} diff --git a/Assets/Content/WorldObjects/Items/Consumable/Food/Drinks/Soda/SodaCanGeneric.prefab b/Assets/Content/WorldObjects/Items/Consumable/Food/Drinks/Soda/SodaCanGeneric.prefab index 4306807705..1bcd23c96c 100644 --- a/Assets/Content/WorldObjects/Items/Consumable/Food/Drinks/Soda/SodaCanGeneric.prefab +++ b/Assets/Content/WorldObjects/Items/Consumable/Food/Drinks/Soda/SodaCanGeneric.prefab @@ -319,9 +319,15 @@ MonoBehaviour: _lightImpactSounds: - {fileID: 8300000, guid: 1a34c805f84be3b4caac14d7de790607, type: 3} - {fileID: 8300000, guid: 8d93fdf9dcada204a952e29213f0293f, type: 3} + _lightImpactSoundReferences: + - {fileID: 11400000, guid: a018567162ec7ad40bdd2d7d8ae6074b, type: 2} + - {fileID: 11400000, guid: 5d6d1f8ffca30774e8791de6a68f2d97, type: 2} _hardImpactSounds: - {fileID: 8300000, guid: f00c6b5a098e84b4b87d80d23b4f295a, type: 3} - {fileID: 8300000, guid: b315c4abdef36244fb211c5f643d411a, type: 3} + _hardImpactSoundReferences: + - {fileID: 11400000, guid: 4cac36cceddb62f4c914372c095706e3, type: 2} + - {fileID: 11400000, guid: b30cc2cc7d13a7f459a5911da388787f, type: 2} --- !u!114 &2460252798676826451 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index f708c9f0c9..b54bdec91a 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -1,4 +1,7 @@ using SS3D.Attributes; +using System.Linq; +using UnityEditor.AddressableAssets; +using UnityEditor.AddressableAssets.Settings; using UnityEngine; namespace SS3D.Data.AssetDatabases @@ -20,5 +23,36 @@ public sealed class WorldObjectAssetReference : ScriptableObject #endif [Header("This file is auto-generated, do not modify it manually")] public string Database; - } + +#if UNITY_EDITOR + public void Init(Object asset) + { + string assetPath = UnityEditor.AssetDatabase.GetAssetPath(asset); + string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath); + + AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings; + AddressableAssetEntry entry = settings.FindAssetEntry(guid); + if (entry == null) + { + Debug.LogError($"Asset {asset.name} with GUID {guid} not found in Addressable Asset Settings."); + return; + } + + AssetDatabaseSettings databaseSettings = Coimbra.ScriptableSettings.GetOrFind(); + + if (!databaseSettings) + { + Debug.LogError("AssetDatabaseSettings not found."); + return; + } + + foreach (AssetDatabase database in databaseSettings.IncludedAssetDatabases.Where(database => database.AssetGroup == entry.parentGroup)) + { + Id = guid; + Database = database.DatabaseID; + break; + } + } + #endif + } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs index 3bcc442abe..82e5054a64 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs @@ -6,7 +6,9 @@ using SS3D.Core; using SS3D.Core.Behaviours; using SS3D.Data; +using SS3D.Data.AssetDatabases; using SS3D.Data.Generated; +using UnityEditor; using UnityEngine; namespace SS3D.Systems.Audio @@ -63,9 +65,9 @@ private void Start() /// Grabs a free audio source and parents it to a specific object before playing it. /// [Server] - public void PlayAudioSource(AudioType audioType, AudioClip audioClipId, NetworkObject parent) + public void PlayAudioSource(AudioType audioType, string audioClipId, NetworkObject parent) { - RpcPlayAudioSource(audioType, audioClipId.name, parent.transform.position, parent); + RpcPlayAudioSource(audioType, audioClipId, parent.transform.position, parent); } /// @@ -73,10 +75,10 @@ public void PlayAudioSource(AudioType audioType, AudioClip audioClipId, NetworkO /// Volume, pitch, and ranges are optional. /// [Server] - public void PlayAudioSource(AudioType audioType, AudioClip audioClipId, Vector3 position, NetworkObject parent, + public void PlayAudioSource(AudioType audioType, string audioClipId, Vector3 position, NetworkObject parent, bool isLooping = false, float volume = 0.7f, float pitch = 1f, float minRange = 1f, float maxRange = 500f) { - RpcPlayAudioSource(audioType, audioClipId.name, position, parent, isLooping, volume, pitch, minRange, maxRange); + RpcPlayAudioSource(audioType, audioClipId, position, parent, isLooping, volume, pitch, minRange, maxRange); } [Server] @@ -98,13 +100,13 @@ public void RPCSetTimeAudioSource(NetworkObject parent, float time) } [ObserversRpc] - public void RpcPlayAudioSource(AudioType type, string audioClip, Vector3 position, NetworkObject parent, + public void RpcPlayAudioSource(AudioType type, string audioClipID, Vector3 position, NetworkObject parent, bool isLooping = false, float volume = 0.7f, float pitch = 1f, float minRange = 1f, float maxRange = 500f) { AudioSource audioSource = FindAvailableAudioSource(type); audioSource.gameObject.transform.position = position; - audioSource.clip = Assets.Get(AssetDatabases.Sounds, audioClip); + audioSource.clip = Assets.Get(AssetDatabases.Sounds, audioClipID); audioSource.volume = volume; audioSource.pitch = pitch; audioSource.minDistance = minRange; @@ -240,6 +242,41 @@ public void PurgeUnusedAudioSources() } } } + +#if UNITY_EDITOR + [MenuItem("Assets/Create/Audio Clip Reference")] + private static void CreateAudioClipReference() + { + AudioClip[] selectedClips = UnityEditor.Selection.GetFiltered(SelectionMode.Assets); + + foreach (AudioClip selectedClip in selectedClips) + { + CreateAudioClipReference(selectedClip); + } + } + + private static void CreateAudioClipReference(AudioClip selectedClip) + { + if (!selectedClip) + { + Debug.LogError("No audio clip selected."); + + return; + } + + WorldObjectAssetReference asset = ScriptableObject.CreateInstance(); + asset.Init(selectedClip); + + string clipPath = UnityEditor.AssetDatabase.GetAssetPath(selectedClip); + string clipDirectory = System.IO.Path.GetDirectoryName(clipPath); + string assetPath = System.IO.Path.Combine(clipDirectory, $"{selectedClip.name}.asset"); + + UnityEditor.AssetDatabase.CreateAsset(asset, assetPath); + UnityEditor.AssetDatabase.SaveAssets(); + + Debug.Log($"Created Audio Clip Reference for {selectedClip.name} at {assetPath}", asset); + } + #endif } } diff --git a/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs b/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs index 21b4856667..ee1c1c7da1 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using UnityEngine; using SS3D.Core; +using SS3D.Data.AssetDatabases; using System.Electricity; using UnityEngine.Serialization; @@ -18,7 +19,7 @@ public class Boombox : InteractionTargetNetworkBehaviour, IToggleable private MachinePowerConsumer _powerConsumer; [SerializeField] - private List _songs; + private List _songReferences; [SyncVar] public bool AudioOn; @@ -54,7 +55,7 @@ public void Toggle() if (AudioOn) { - SubSystems.Get().PlayAudioSource(AudioType.Music, _songs[CurrentMusic], GameObject.transform.position, NetworkObject, + SubSystems.Get().PlayAudioSource(AudioType.Music, _songReferences[CurrentMusic].Id, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } else @@ -86,8 +87,8 @@ public void ChangeCurrentMusic() SubSystems.Get().StopAudioSource(NetworkObject); SubSystems.Get().SetTimeAudioSource(NetworkObject, 0f); - CurrentMusic = (CurrentMusic + 1) % (_songs.Count); - SubSystems.Get().PlayAudioSource(AudioType.Music, _songs[CurrentMusic], GameObject.transform.position, NetworkObject, + CurrentMusic = (CurrentMusic + 1) % _songReferences.Count; + SubSystems.Get().PlayAudioSource(AudioType.Music, _songReferences[CurrentMusic].Id, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } diff --git a/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs b/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs index be6a1a1d2a..117fd05d65 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs @@ -2,6 +2,7 @@ using FishNet.Object; using SS3D.Core; using FishNet; +using SS3D.Data.AssetDatabases; using UnityEngine.Serialization; namespace SS3D.Systems.Audio @@ -46,13 +47,21 @@ public class NoisyCollision : MonoBehaviour [Tooltip("How fast this object must hit another in order to make a hard impact sound.")] private float _hardImpactVelocity = 7.5f; + // [SerializeField] + // [Tooltip("List of possible sounds that will play when this object collides lightly.")] + // private AudioClip[] _lightImpactSounds; + [SerializeField] - [Tooltip("List of possible sounds that will play when this object collides lightly.")] - private AudioClip[] _lightImpactSounds; + [Tooltip("List of references of possible sounds that will play when this object collides lightly.")] + private WorldObjectAssetReference[] _lightImpactSoundReferences; + + // [SerializeField] + // [Tooltip("List of possible sounds that will play when this object collides heavily.")] + // private AudioClip[] _hardImpactSounds; [SerializeField] - [Tooltip("List of possible sounds that will play when this object collides heavily.")] - private AudioClip[] _hardImpactSounds; + [Tooltip("List of references of possible sounds that will play when this object collides heavily.")] + private WorldObjectAssetReference[] _hardImpactSoundReferences; //For some reason, this is needed to have an enable/disable feature. Peculiar. private void FixedUpdate() { } @@ -60,7 +69,7 @@ private void FixedUpdate() { } private void OnValidate() { // Throw a warning if the user configured it retardedly. - if ((!(_lightImpactVelocity > _hardImpactVelocity)) && (!_useHardImpactSounds || _hardImpactSounds != null) && (_lightImpactSounds != null)) + if ((!(_lightImpactVelocity > _hardImpactVelocity)) && (!_useHardImpactSounds || _hardImpactSoundReferences != null) && (_lightImpactSoundReferences != null)) { return; } @@ -79,11 +88,11 @@ private void OnCollisionEnter(Collision other) //Only execute this code if we're supposed to make collision noises. if (_useHardImpactSounds && other.relativeVelocity.magnitude > _hardImpactVelocity) { - PlayCollisionSound(_hardImpactSounds); + PlayCollisionSound(_hardImpactSoundReferences); } else if (other.relativeVelocity.magnitude > _lightImpactVelocity) { - PlayCollisionSound(_lightImpactSounds); + PlayCollisionSound(_lightImpactSoundReferences); } } @@ -92,19 +101,19 @@ private void OnCollisionEnter(Collision other) /// /// [Server] - private void PlayCollisionSound(AudioClip[] soundPool) + private void PlayCollisionSound(WorldObjectAssetReference[] soundPool) { float pitch = Random.Range(_basePitch - _pitchModulationLow, _basePitch + _pitchModulationHigh); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, PickSound(soundPool), gameObject.transform.position, null, + SubSystems.Get().PlayAudioSource(AudioType.Sfx, PickSound(soundPool).Id, gameObject.transform.position, null, false, _collisionVolume, pitch); } - private AudioClip PickSound(AudioClip[] availableSounds) + private WorldObjectAssetReference PickSound(WorldObjectAssetReference[] availableSounds) { // Pick a clip from the supplied array and return it - AudioClip currentClip = availableSounds[Random.Range(0, availableSounds.Length)]; + WorldObjectAssetReference currentClipReference = availableSounds[Random.Range(0, availableSounds.Length)]; - return currentClip; + return currentClipReference; } } } diff --git a/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs b/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs index 1b7e3ad9d3..40a30e62b1 100644 --- a/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs +++ b/Assets/Scripts/SS3D/Systems/Electricity/FuelPowerGenerator.cs @@ -62,8 +62,7 @@ private void HandleSound(bool isEnabled) } else { - AudioClip fuelPowerGeneratorClip = Assets.Get(AssetDatabases.Sounds, Sounds.FuelPowerGenerator); - SubSystems.Get().PlayAudioSource(AudioType.Music, fuelPowerGeneratorClip, Position, NetworkObject, true, 0.7f, 1, 1, 10); + SubSystems.Get().PlayAudioSource(AudioType.Music, Sounds.FuelPowerGenerator, Position, NetworkObject, true, 0.7f, 1, 1, 10); } } diff --git a/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs b/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs index 60f8695684..456d731cf0 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/AirlockStateMachine.cs @@ -33,15 +33,13 @@ public override void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo if (stateInfo.IsName(Opening)) { ChangeColors(_openingColor, animator); - AudioClip airlockOpenClip = Assets.Get(AssetDatabases.Sounds, Sounds.AirlockOpen); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, airlockOpenClip, animator.GetComponent()); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.AirlockOpen, animator.GetComponent()); } if (stateInfo.IsName(Closing)) { ChangeColors(_closingColor, animator); - AudioClip airlockCloseClip = Assets.Get(AssetDatabases.Sounds, Sounds.AirlockClose); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, airlockCloseClip, animator.GetComponent()); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.AirlockClose, animator.GetComponent()); } } diff --git a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs index efed611d73..1d8eec98ed 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs @@ -76,8 +76,7 @@ public void DispenseProduct(int productIndex) if (productToDispenseStock.Stock <= 0) { - AudioClip bikeHornClip = Assets.Get(AssetDatabases.Sounds, Sounds.BikeHorn); - audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, bikeHornClip, Position, NetworkObject, false, 0.7f, 1, 1, 3); + audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, Sounds.BikeHorn, Position, NetworkObject, false, 0.7f, 1, 1, 3); return; } @@ -85,8 +84,7 @@ public void DispenseProduct(int productIndex) _powerConsumer.UseMachineOnce(); productToDispenseStock.Stock--; - AudioClip can1Clip = Assets.Get(AssetDatabases.Sounds, Sounds.Can1); - audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, can1Clip, Position, NetworkObject, false, 0.7f, 1, 1, 3); + audioSubSystem.PlayAudioSource(Audio.AudioType.Sfx, Sounds.Can1, Position, NetworkObject, false, 0.7f, 1, 1, 3); ItemSubSystem itemSystem = SubSystems.Get(); Quaternion quaternion = Quaternion.Euler(new Vector3(Random.Range(0, 360), Random.Range(0, 360), Random.Range(0, 360))); diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs index 99f3393668..e6dd6d5626 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Generic/BikeHorn.cs @@ -26,8 +26,7 @@ public class BikeHorn : Item public void Honk() { _animator.SetTrigger(HonkAnimation); - AudioClip bikeHornClip = Assets.Get(AssetDatabases.Sounds, Sounds.BikeHorn); - SubSystems.Get().PlayAudioSource(AudioType.Sfx, bikeHornClip, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); + SubSystems.Get().PlayAudioSource(AudioType.Sfx, Sounds.BikeHorn, GameObject.transform.position, NetworkObject, false, 0.7f, 1, 1, 5); } public bool IsHonking() From 6af2259adf3d8fef52d4cf0d152cd6ba3e1d9eb2 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Mon, 2 Feb 2026 16:39:17 -0500 Subject: [PATCH 32/54] Refactor asset retrieval in CraftingRecipe, CraftingSubSystem, MultiStepCraftable, and Item to simplify usage of Assets.Get method --- Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs | 2 +- .../Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs | 10 +++++----- .../SS3D/Systems/Crafting/MultiStepCraftable.cs | 2 +- Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs index d870f6078c..63a973803e 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs @@ -26,7 +26,7 @@ public class CraftingRecipe : ScriptableObject /// /// First step of the recipe, which should have the same name as the target of the recipe. /// - public string RootStepName => Target ? Assets.Get(Target.Database, Target.Id)?.name : null; + public string RootStepName => Target ? Assets.Get(Target)?.name : null; public bool HasInitial => Steps.Any(x => x.IsInitialState); diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs index ffe4dd3032..c864c66ef5 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs @@ -100,7 +100,7 @@ private bool TryGetRecipeLinks(CraftingInteractionType interactionType, GameObje if (!_recipeOrganiser.TryGetValue(targetAssetReference.Asset.Id, out List recipes)) { - Log.Information(this, $"no recipes with target's name {targetAssetReference.Asset.Id}"); + Log.Information(this, $"no recipes with target's name {targetAssetReference.Asset.name}"); return false; } @@ -156,7 +156,7 @@ public void Craft(CraftingInteraction interaction, InteractionEvent interactionE { for (int i = 0; i < secondaryResult.Amount; i++) { - GameObject secondaryResultPrefab = Assets.Get(secondaryResult.Asset.Database, secondaryResult.Asset.Id); + GameObject secondaryResultPrefab = Assets.Get(secondaryResult.Asset); DefaultCraft(interaction, interactionEvent, secondaryResultPrefab, link.Target); } } @@ -190,7 +190,7 @@ private void SpawnOrModifyMainResult(WorldObjectAssetReference result, CraftingI { GameObject resultInstance; - GameObject resultPrefab = Assets.Get(result.Database, result.Id); + GameObject resultPrefab = Assets.Get(result); if (!resultPrefab) { @@ -228,7 +228,7 @@ private string CurrentStepName(GameObject target) return ""; } - GameObject targetPrefab = Assets.Get(targetAssetReference.Asset.Database, targetAssetReference.Asset.Id); + GameObject targetPrefab = Assets.Get(targetAssetReference.Asset); if (targetPrefab == null) { @@ -553,7 +553,7 @@ private bool ResultIsValid(InteractionEvent interactionEvent, RecipeStep recipeS { if (!recipeStep.TryGetResult(out WorldObjectAssetReference recipeResult)) return true; - GameObject recipeResultPrefab = Assets.Get(recipeResult.Database, recipeResult.Id); + GameObject recipeResultPrefab = Assets.Get(recipeResult); if (recipeResultPrefab && recipeResultPrefab.TryGetComponent(out PlacedTileObject result)) { diff --git a/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs b/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs index 8a70bb5116..d883f00872 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/MultiStepCraftable.cs @@ -32,7 +32,7 @@ protected override void OnAwake() } else { - GameObject targetPrefab = Assets.Get(targetAssetReference.Asset.Database, targetAssetReference.Asset.Id); + GameObject targetPrefab = Assets.Get(targetAssetReference.Asset); _currentStepName = targetPrefab?.name; } } diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs index bbe857c979..15362c91e4 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs @@ -120,7 +120,7 @@ public WorldObjectAssetReference Asset } } - public Item Prefab => Asset ? Assets.Get(Asset.Database, Asset.Id) : null; + public Item Prefab => Asset ? Assets.Get(Asset) : null; /// /// Initialise this item fields. Can only be called once. From 1d9d064772abd919c5efda92f8fe5a28fda17afd Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:19:35 -0500 Subject: [PATCH 33/54] Refactor asset management in AssetDatabase and WorldObjectAssetReference to streamline addressable asset handling and improve code clarity --- .../SS3D/Data/AssetDatabases/AssetDatabase.cs | 61 ++++++++++++++++--- .../WorldObjectAssetReference.cs | 45 +++++++++++++- Assets/Scripts/SS3D/Data/Assets.cs | 27 +++++++- .../SS3D/Systems/Audio/AudioSubSystem.cs | 26 +------- 4 files changed, 120 insertions(+), 39 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs index b67e3be321..eb68259ef2 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabase.cs @@ -1,16 +1,14 @@ using Coimbra; using JetBrains.Annotations; using Serilog; -using System.Collections.Generic; -using Object = UnityEngine.Object; -using SS3D.CodeGeneration; using SS3D.CodeGeneration.Creators; +using System.Collections.Generic; using System.Linq; -using UnityEditor; using UnityEngine; -using UnityEngine.Serialization; - +using Object = UnityEngine.Object; #if UNITY_EDITOR +using UnityEditor; +using UnityEditor.AddressableAssets; using UnityEditor.AddressableAssets.Settings; #endif @@ -45,11 +43,11 @@ public sealed class AssetDatabase : ScriptableObject /// The asset group that constitutes this AssetDatabase, the system gets every asset from it and adds to an asset list. /// public AddressableAssetGroup AssetGroup; - +#endif + /// /// All loaded assets that will be included in the built game. /// -#endif public SerializableDictionary Assets; #if UNITY_EDITOR @@ -108,10 +106,10 @@ public bool TryGet([NotNull] string index, [CanBeNull] out T asset) /// /// /// - public void Add(Object asset) + public void Add([NotNull] TAsset asset) where TAsset : Object { - Assets.Add(asset.name, asset as TAsset); + Assets.Add(asset.name, asset); } #if UNITY_EDITOR @@ -148,6 +146,49 @@ public void GenerateDatabaseCode() DatabaseScriptCreator.CreateAtPath(DatabaseAssetPath, DatabaseName, Assets.Values.ToList(), DatabaseAssetNamespaceName); } + + public bool AddToAddressables([NotNull] Object asset) + { + string path = UnityEditor.AssetDatabase.GetAssetPath(asset); + + if (string.IsNullOrEmpty(path)) + { + Log.Error($"Asset {asset.name} does not have a valid path, cannot add to addressables."); + + return false; + } + + string guid = UnityEditor.AssetDatabase.AssetPathToGUID(path); + + if (!AssetGroup) + { + Log.Error($"Addressable Asset Group {name} not found, cannot add asset {asset.name} to addressables."); + + return false; + } + + AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings; + AddressableAssetEntry entry = settings.FindAssetEntry(guid); + + if (entry != null) + { + Log.Warning($"Asset {asset.name} is already in Addressable Group {entry.parentGroup.name}."); + + return false; + } + + settings.CreateOrMoveEntry(guid, AssetGroup); + + Add(asset); + + EditorUtility.SetDirty(asset); + EditorUtility.SetDirty(this); + + UnityEditor.AssetDatabase.SaveAssetIfDirty(asset); + UnityEditor.AssetDatabase.SaveAssetIfDirty(this); + + return true; + } #endif } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs index b54bdec91a..5169a754ee 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs @@ -1,7 +1,10 @@ -using SS3D.Attributes; +using JetBrains.Annotations; +using SS3D.Attributes; using System.Linq; +#if UNITY_EDITOR using UnityEditor.AddressableAssets; using UnityEditor.AddressableAssets.Settings; + #endif using UnityEngine; namespace SS3D.Data.AssetDatabases @@ -12,6 +15,13 @@ namespace SS3D.Data.AssetDatabases /// public sealed class WorldObjectAssetReference : ScriptableObject { +#if UNITY_EDITOR + /// + /// The path in the project where to put the WorldObjectAssetReference assets. + /// + public static readonly string WorldObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; +#endif + #if UNITY_EDITOR [ReadOnly] #endif @@ -25,8 +35,36 @@ public sealed class WorldObjectAssetReference : ScriptableObject public string Database; #if UNITY_EDITOR - public void Init(Object asset) + [CanBeNull] + public static WorldObjectAssetReference Create(Object asset) { + if (!asset) + { + Debug.LogError("No asset found."); + + return null; + } + + WorldObjectAssetReference assetReference = CreateInstance(); + assetReference.Init(asset); + + string assetPath = System.IO.Path.Combine(WorldObjectAssetPath, $"{asset.name}.asset"); + + UnityEditor.AssetDatabase.CreateAsset(assetReference, assetPath); + UnityEditor.AssetDatabase.SaveAssetIfDirty(assetReference); + + return assetReference; + } + + private void Init(Object asset) + { + if (!asset) + { + Debug.LogError("No asset found."); + + return; + } + string assetPath = UnityEditor.AssetDatabase.GetAssetPath(asset); string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath); @@ -53,6 +91,7 @@ public void Init(Object asset) break; } } - #endif + + #endif } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/Assets.cs b/Assets/Scripts/SS3D/Data/Assets.cs index a54c2e1b80..f3e11a4932 100644 --- a/Assets/Scripts/SS3D/Data/Assets.cs +++ b/Assets/Scripts/SS3D/Data/Assets.cs @@ -1,10 +1,17 @@ -using System.Collections.Generic; -using Coimbra; +using Coimbra; using JetBrains.Annotations; using SS3D.Data.AssetDatabases; using SS3D.Logging; using System; +using System.Collections.Generic; +using AssetDatabase = SS3D.Data.AssetDatabases.AssetDatabase; using Object = UnityEngine.Object; +#if UNITY_EDITOR +using System.IO; +using UnityEditor; +using UnityEditor.AddressableAssets; +using UnityEditor.AddressableAssets.Settings; +#endif namespace SS3D.Data { @@ -95,5 +102,21 @@ public static AssetDatabase GetDatabase([NotNull] string databaseId) return database; } + +#if UNITY_EDITOR + public static bool AddToAddressables(string databaseID, Object asset) + { + AssetDatabase database = GetDatabase(databaseID); + + if (database) + { + return database.AddToAddressables(asset); + } + + Log.Error(typeof(Assets), $"Database of type {databaseID} not found cannot add to addressables"); + return false; + + } +#endif } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs index 82e5054a64..a1b6d755ee 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs @@ -251,32 +251,10 @@ private static void CreateAudioClipReference() foreach (AudioClip selectedClip in selectedClips) { - CreateAudioClipReference(selectedClip); + WorldObjectAssetReference.Create(selectedClip); } } - - private static void CreateAudioClipReference(AudioClip selectedClip) - { - if (!selectedClip) - { - Debug.LogError("No audio clip selected."); - - return; - } - - WorldObjectAssetReference asset = ScriptableObject.CreateInstance(); - asset.Init(selectedClip); - - string clipPath = UnityEditor.AssetDatabase.GetAssetPath(selectedClip); - string clipDirectory = System.IO.Path.GetDirectoryName(clipPath); - string assetPath = System.IO.Path.Combine(clipDirectory, $"{selectedClip.name}.asset"); - - UnityEditor.AssetDatabase.CreateAsset(asset, assetPath); - UnityEditor.AssetDatabase.SaveAssets(); - - Debug.Log($"Created Audio Clip Reference for {selectedClip.name} at {assetPath}", asset); - } - #endif +#endif } } From c46ef89266eebfc8cef9340e8a6b0dd55667b692 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:36:14 -0500 Subject: [PATCH 34/54] Refactor asset handling in PlacedItemObject, PlacedTileObject, and ConstructionHologramManager to utilize WorldObjectAssetReference for improved asset retrieval --- .../Tile/PlacedObjects/PlacedItemObject.cs | 4 +++- .../Tile/PlacedObjects/PlacedTileObject.cs | 4 +++- .../SS3D/Systems/Tile/SO/GenericObjectSo.cs | 11 +++++++---- .../ConstructionHologramManager.cs | 17 ++++++++++++----- .../SS3D/Systems/Tile/TileResourceLoader.cs | 3 ++- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedItemObject.cs b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedItemObject.cs index 590e84ae3e..a8fef437be 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedItemObject.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedItemObject.cs @@ -1,6 +1,7 @@ using FishNet; using FishNet.Object; using SS3D.Core; +using SS3D.Data; using SS3D.Logging; using System; using System.Collections; @@ -34,7 +35,8 @@ public static PlacedItemObject Create(Vector3 worldPosition, Quaternion rotation } else { - placedGameObject = Instantiate(itemSo.prefab); + GameObject itemPrefab = Assets.Get(itemSo.PrefabAsset); + placedGameObject = Instantiate(itemPrefab); } placedGameObject.transform.SetPositionAndRotation(worldPosition, rotation); diff --git a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs index 5d167dd843..21776e90df 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs @@ -2,6 +2,7 @@ using FishNet.Object; using SS3D.Attributes; using SS3D.Core; +using SS3D.Data; using SS3D.Data.AssetDatabases; using SS3D.Logging; using SS3D.Systems.Tile.Connections; @@ -29,7 +30,8 @@ public class PlacedTileObject: NetworkBehaviour, IWorldObjectAsset /// public static PlacedTileObject Create(Vector3 worldPosition, Vector2Int origin, Direction dir, TileObjectSo tileObjectSo) { - GameObject placedGameObject = Instantiate(tileObjectSo.prefab); + GameObject tileObjectPrefab = Assets.Get(tileObjectSo.PrefabAsset); + GameObject placedGameObject = Instantiate(tileObjectPrefab); placedGameObject.transform.SetPositionAndRotation(worldPosition, Quaternion.Euler(0, TileHelper.GetRotationAngle(dir), 0)); PlacedTileObject placedObject = placedGameObject.GetComponent(); diff --git a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs index 2353430225..a215b2be05 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; -using System.Collections; -using System.Collections.Generic; +using SS3D.Data.AssetDatabases; using UnityEngine; namespace SS3D.Systems.Tile @@ -11,9 +10,13 @@ namespace SS3D.Systems.Tile public class GenericObjectSo : ScriptableObject { [NotNull] - public string NameString => prefab.name; + public string NameString => PrefabAsset.name; - public GameObject prefab; + public WorldObjectAssetReference PrefabAsset; public Sprite icon; + + [SerializeField] + [HideInInspector] + private string _nameString; } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs index 814bd0366b..260c9c60cc 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs @@ -4,6 +4,8 @@ using FishNet.Object; using SS3D.Core; using SS3D.Core.Behaviours; +using SS3D.Data; +using SS3D.Data.AssetDatabases; using SS3D.Logging; using SS3D.Systems.Inputs; using SS3D.Utils; @@ -62,7 +64,7 @@ public void SetSelectedObject(GenericObjectSo genericObjectSo) _selectedObject = genericObjectSo; DestroyHolograms(); - CreateHologram(genericObjectSo.prefab, TileHelper.GetPointedPosition(!_isPlacingItem)); + CreateHologram(genericObjectSo.PrefabAsset, TileHelper.GetPointedPosition(!_isPlacingItem)); } protected override void OnAwake() @@ -142,7 +144,7 @@ private void HandleUpdate(ref EventContext context, in UpdateEvent updateEvent) { for (int i = 0; i < -difference; i++) { - CreateHologram(_selectedObject.prefab, new()); + CreateHologram(_selectedObject.PrefabAsset, new()); } } @@ -172,8 +174,9 @@ public void SetNextRotation() /// /// Instantiate in the correct position and rotation a single hologram. /// - public ConstructionHologram CreateHologram(GameObject prefab, Vector3 position) + public ConstructionHologram CreateHologram(WorldObjectAssetReference prefabAsset, Vector3 position) { + GameObject prefab = Assets.Get(prefabAsset); GameObject tileObject = Instantiate(prefab); ConstructionHologram hologram = new(tileObject, position, _lastRegisteredDirection); tileObject.transform.rotation = Quaternion.Euler(0, TileHelper.GetRotationAngle(hologram.Direction), 0); @@ -239,8 +242,12 @@ private void HandlePlacePerformed(InputAction.CallbackContext context) DestroyHolograms(); - if (_selectedObject == null) return; - CreateHologram(_selectedObject.prefab, TileHelper.GetPointedPosition(!_isPlacingItem)); + if (_selectedObject == null) + { + return; + } + + CreateHologram(_selectedObject.PrefabAsset, TileHelper.GetPointedPosition(!_isPlacingItem)); } /// diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs b/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs index a366300099..c6e25bb6f3 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs @@ -41,7 +41,8 @@ private IEnumerator LoadAssetsWithIcon(GenericObjectSo[] assets) foreach (GenericObjectSo asset in assets) { - Transform prefabTransform = asset.prefab.transform; + GameObject prefab = Data.Assets.Get(asset.PrefabAsset); + Transform prefabTransform = prefab.transform; Shader shader = Shader.Find("Unlit/ObjectIcon"); Texture2D texture = RuntimePreviewGenerator.GenerateModelPreviewWithShader(prefabTransform, shader, null, 128, 128, true); From c1ce8e579fa98218710e40659c2ca462394c876b Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:37:22 -0500 Subject: [PATCH 35/54] Add new world object asset references files for various objects TileObjectsSO prefabs to enhance asset management --- .../Addressables/AssetGroups/Items.asset | 328 ++++++++++++++++++ Assets/Content/Data/Databases/Items.asset | 164 +++++++++ .../Furniture/Flora/PottedPlants/Plant0.asset | 4 +- .../Furniture/Flora/PottedPlants/Plant7.asset | 4 +- .../Furniture/Generic/JukeboxBlueGreen.asset | 4 +- .../Furniture/Generic/NukeCart.asset | 4 +- .../Seats/Chairs/Office/OfficeChair.asset | 4 +- .../Seats/Chairs/Office/OfficeChairBlue.asset | 4 +- .../Seats/Chairs/Office/OfficeChairGrey.asset | 4 +- .../Seats/Chairs/Plastic/PlasticChair.asset | 4 +- .../Chairs/Plastic/PlasticChairBlue.asset | 4 +- .../Chairs/Plastic/PlasticChairGrey.asset | 4 +- .../Furniture/Generic/Seats/DinnerBooth.asset | 4 +- .../Resources/Furniture/Generic/Sink.asset | 3 + .../Surfaces/Tables/TableFrameSteel.asset | 4 +- .../Surfaces/Tables/TableFrameWood.asset | 4 +- .../Generic/Surfaces/Tables/TableGlass.asset | 4 +- .../Generic/Surfaces/Tables/TablePoker.asset | 4 +- .../Generic/Surfaces/Tables/TableSteel.asset | 4 +- .../Generic/Surfaces/Tables/TableWood.asset | 4 +- .../Furniture/Generic/WaterCooler.asset | 4 +- .../Machines/Atmospherics/Scrubber.asset | 4 +- .../Machines/Atmospherics/Vent.asset | 4 +- .../Engineering/PacManGenerator.asset | 4 +- .../Engineering/PowerCellCharger.asset | 3 + .../Furniture/Machines/Engineering/SMES.asset | 4 +- .../Machines/Engineering/SolarPanel.asset | 3 + .../Engineering/SolarTrackingBeacon.asset | 4 +- .../Machines/Generic/SlotMachine.asset | 3 + .../Machines/Generic/Tanks/FuelTank.asset | 3 + .../Machines/Generic/Tanks/WaterTank.asset | 3 + .../Furniture/Machines/Kitchen/Blender.asset | 4 +- .../Furniture/Machines/Kitchen/Gibber.asset | 3 + .../Machines/Kitchen/Microwave.asset | 4 +- .../Kitchen/TableBoozeDispenser.asset | 4 +- .../Furniture/Machines/MachineFrame.asset | 3 + .../Machines/Medical/ChemicalDispenser.asset | 3 + .../Furniture/Machines/Medical/Cryotube.asset | 3 + .../Machines/Medical/SleeperBed.asset | 3 + .../Machines/Supply/DisposalBin.asset | 4 +- .../Machines/Supply/DisposalOutlet.asset | 4 +- .../Machines/Vendors/VendorHotDrinks.asset | 4 +- .../Vendors/VendorRobustSoftdrinks.asset | 4 +- .../Machines/Vendors/VendorSecTech.asset | 4 +- .../Machines/Vendors/VendorYouTool.asset | 4 +- .../Furniture/Storage/Lockers/Locker.asset | 4 +- .../Storage/Lockers/SecureLocker.asset | 4 +- .../Storage/Lockers/SecurityLocker.asset | 4 +- .../Resources/Items/Clothing/Backpack.asset | 3 +- .../Resources/Items/Clothing/GasMask.asset | 3 +- .../Items/Clothing/GloveInsulated.asset | 2 + .../Resources/Items/Clothing/Headset.asset | 2 + .../Items/Clothing/HeadsetSecurity.asset | 2 + .../Items/Clothing/JumpsuitBotany.asset | 2 + .../Items/Clothing/JumpsuitEngineer.asset | 2 + .../Items/Clothing/JumpsuitGrey.asset | 2 + .../Items/Clothing/JumpsuitSecurity.asset | 2 + .../Resources/Items/Clothing/ShoeHiTop.asset | 2 + .../Items/Clothing/ShoeJackboots.asset | 2 + .../Resources/Items/Clothing/Sunglasses.asset | 3 +- .../Resources/Items/Clothing/ToolBelt.asset | 3 +- .../Resources/Items/Clothing/TruckerCap.asset | 3 +- .../Consumables/Chemical/BrutePatch.asset | 2 + .../Consumables/Chemical/BurnPatch.asset | 2 + .../Consumables/Chemical/MedicalPatch.asset | 2 + .../Food/Drinks/Soda/SodaCanBeepsSoda.asset | 3 +- .../Food/Drinks/Soda/SodaCanBeepyLime.asset | 3 +- .../Food/Drinks/Soda/SodaCanCannedAir.asset | 3 +- .../Drinks/Soda/SodaCanCannedLaughter.asset | 3 +- .../Food/Drinks/Soda/SodaCanCola.asset | 3 +- .../Drinks/Soda/SodaCanDukePurpleTea.asset | 3 +- .../Food/Drinks/Soda/SodaCanTonic.asset | 3 +- .../Food/General/Snacks/DonkPocket.asset | 2 + .../Resources/Items/Cosmetic/BikeHorn.asset | 3 +- .../Data/TileMap/Resources/Items/Doodad.asset | 3 +- .../Items/Functional/Generic/Boombox.asset | 2 + .../Items/Functional/Generic/FloorTile.asset | 2 + .../Generic/Identification/IDCard.asset | 3 +- .../Generic/Identification/PDA.asset | 3 +- .../Identification/SecurityIDCard.asset | 3 +- .../Generic/Identification/SecurityPDA.asset | 3 +- .../Items/Functional/Generic/Poster.asset | 3 +- .../Functional/Generic/Tanks/OxygenTank.asset | 2 + .../Functional/Generic/Tanks/PlasmaTank.asset | 2 + .../Materials/ElectricalCable.asset | 2 + .../Functional/Materials/ElectricalWire.asset | 2 + .../Materials/GlassReinforcedSheet.asset | 2 + .../Functional/Materials/GlassShard.asset | 2 + .../Functional/Materials/GlassSheet.asset | 2 + .../Materials/SteelReinforcedSheet.asset | 2 + .../Items/Functional/Materials/SteelRod.asset | 2 + .../Functional/Materials/SteelSheet.asset | 2 + .../Items/Functional/Materials/WoodLog.asset | 2 + .../Functional/Materials/WoodPlank.asset | 2 + .../Parts/MachineParts/MatterBin.asset | 2 + .../Parts/MachineParts/MicroLaser.asset | 2 + .../Parts/PowerCells/PowerCell.asset | 3 +- .../Parts/PowerCells/PowerCellAdmin.asset | 3 +- .../Functional/Storage/Objects/Medkit.asset | 2 + .../Storage/Objects/ToolboxBlue.asset | 3 +- .../Functional/Storage/Substances/Mug.asset | 3 +- .../Functional/Tools/Botany/Hatchet.asset | 2 + .../Command/NuclearAuthenticationDisk.asset | 3 +- .../Tools/Engineering/Crowbar.asset | 3 +- .../Tools/Engineering/Multitool.asset | 3 +- .../Tools/Engineering/ScrewdriverBlue.asset | 3 +- .../Functional/Tools/Engineering/Welder.asset | 2 + .../Tools/Engineering/Wirecutters.asset | 3 +- .../Functional/Tools/Engineering/Wrench.asset | 3 +- .../Tools/Generic/FlashlightBlue.asset | 3 +- .../Tools/Kitchen/KitchenKnife.asset | 3 +- .../Tools/Medical/HealthScanner.asset | 2 + .../Structures/Doors/AirlockCivilian.asset | 4 +- .../Structures/Doors/AirlockSecurity.asset | 4 +- .../Resources/Structures/Floors/Catwalk.asset | 4 +- .../Resources/Structures/Floors/Lattice.asset | 4 +- .../Resources/Structures/Floors/Plenum.asset | 4 +- .../Floors/TileOverlays/CornerBlue.asset | 4 +- .../Floors/TileOverlays/CornerBrown.asset | 4 +- .../Floors/TileOverlays/CornerGreen.asset | 4 +- .../Floors/TileOverlays/CornerOrange.asset | 4 +- .../Floors/TileOverlays/CornerPurple.asset | 4 +- .../Floors/TileOverlays/CornerRed.asset | 4 +- .../Structures/Floors/Tiles/TIleGrey.asset | 4 +- .../Structures/Floors/Tiles/TileBar.asset | 4 +- .../Structures/Floors/Tiles/TileCarpet.asset | 6 +- .../Structures/Floors/Tiles/TileDirt.asset | 4 +- .../Structures/Floors/Tiles/TileGrass.asset | 4 +- .../Floors/Tiles/TileGreyDark.asset | 4 +- .../Structures/Floors/Tiles/TileKitchen.asset | 4 +- .../Structures/Floors/Tiles/TilePlating.asset | 4 +- .../Floors/Tiles/TileReinforced.asset | 4 +- .../Structures/Floors/Tiles/TileWhite.asset | 4 +- .../Structures/Floors/Tiles/TileWood.asset | 4 +- .../Atmospherics/AtmosphericsPipesL1.asset | 4 +- .../Atmospherics/AtmosphericsPipesL2.asset | 4 +- .../Atmospherics/AtmosphericsPipesL3.asset | 4 +- .../Atmospherics/AtmosphericsPipesL4.asset | 4 +- .../Pipes/Disposals/DisposalPipes.asset | 4 +- .../Resources/Structures/WallMounts/APC.asset | 2 + .../Structures/WallMounts/AirAlarm.asset | 2 + .../Structures/WallMounts/FireAlarm.asset | 2 + .../Structures/WallMounts/LightSwitch.asset | 4 +- .../WallMounts/Lights/LightBulbFixture.asset | 4 +- .../WallMounts/Lights/LightTubeFixture.asset | 4 +- .../Structures/WallMounts/Mirror.asset | 2 + .../WallMounts/Posters/PosterHorizontal.asset | 2 + .../WallMounts/Posters/PosterVertical.asset | 2 + .../Structures/Walls/SteelGirder.asset | 4 +- .../Walls/SteelGirderUnbolted.asset | 2 + .../Structures/Walls/SteelWall.asset | 4 +- .../Walls/SteelWallReinforced.asset | 4 +- .../Structures/Walls/SteelWindow.asset | 4 +- .../Walls/SteelWindowReinforced.asset | 4 +- .../Resources/Structures/Wires/Cables.asset | 4 +- .../Data/WorldObjectAssetReferences/APC.asset | 16 + .../WorldObjectAssetReferences/APC.asset.meta | 8 + .../WorldObjectAssetReferences/AirAlarm.asset | 16 + .../AirAlarm.asset.meta | 8 + .../AtmosPipesL1.asset | 16 + .../AtmosPipesL1.asset.meta | 8 + .../AtmosPipesL2.asset | 16 + .../AtmosPipesL2.asset.meta | 8 + .../AtmosPipesL3.asset | 16 + .../AtmosPipesL3.asset.meta | 8 + .../AtmosPipesL4.asset | 16 + .../AtmosPipesL4.asset.meta | 8 + .../WorldObjectAssetReferences/Blender.asset | 16 + .../Blender.asset.meta | 8 + .../WorldObjectAssetReferences/Cables.asset | 16 + .../Cables.asset.meta | 8 + .../WorldObjectAssetReferences/Catwalk.asset | 16 + .../Catwalk.asset.meta | 8 + .../ChemicalDispenser.asset | 16 + .../ChemicalDispenser.asset.meta | 8 + .../CivillianAirlock.asset | 16 + .../CivillianAirlock.asset.meta | 8 + .../WorldObjectAssetReferences/Cryotube.asset | 16 + .../Cryotube.asset.meta | 8 + .../DinnerBooth.asset | 16 + .../DinnerBooth.asset.meta | 8 + .../DisposalBin.asset | 16 + .../DisposalBin.asset.meta | 8 + .../DisposalOutlet.asset | 16 + .../DisposalOutlet.asset.meta | 8 + .../DisposalPipes.asset | 16 + .../DisposalPipes.asset.meta | 8 + .../FancyCarpetRed.asset | 16 + .../FancyCarpetRed.asset.meta | 8 + .../FireAlarm.asset | 16 + .../FireAlarm.asset.meta | 8 + .../WorldObjectAssetReferences/FuelTank.asset | 16 + .../FuelTank.asset.meta | 8 + .../WorldObjectAssetReferences/Gibber.asset | 16 + .../Gibber.asset.meta | 8 + .../JukeboxBlueGreen.asset | 16 + .../JukeboxBlueGreen.asset.meta | 8 + .../WorldObjectAssetReferences/Lattice.asset | 16 + .../Lattice.asset.meta | 8 + .../LightBulbFixture.asset | 16 + .../LightBulbFixture.asset.meta | 8 + .../LightSwitch.asset | 16 + .../LightSwitch.asset.meta | 8 + .../LightTubeFixture.asset | 16 + .../LightTubeFixture.asset.meta | 8 + .../WorldObjectAssetReferences/Locker.asset | 16 + .../Locker.asset.meta | 8 + .../LockerSecure.asset | 16 + .../LockerSecure.asset.meta | 8 + .../MachineFrame.asset | 16 + .../MachineFrame.asset.meta | 8 + .../Microwave.asset | 16 + .../Microwave.asset.meta | 8 + .../WorldObjectAssetReferences/Mirror.asset | 16 + .../Mirror.asset.meta | 8 + .../WorldObjectAssetReferences/NukeCart.asset | 16 + .../NukeCart.asset.meta | 8 + .../OfficeChair.asset | 16 + .../OfficeChair.asset.meta | 8 + .../OfficeChairBlue.asset | 16 + .../OfficeChairBlue.asset.meta | 8 + .../OfficeChairGrey.asset | 16 + .../OfficeChairGrey.asset.meta | 8 + .../PacManGenerator.asset | 16 + .../PacManGenerator.asset.meta | 8 + .../WorldObjectAssetReferences/Plant0.asset | 16 + .../Plant0.asset.meta | 8 + .../WorldObjectAssetReferences/Plant7.asset | 16 + .../Plant7.asset.meta | 8 + .../PlasticChair.asset | 16 + .../PlasticChair.asset.meta | 8 + .../PlasticChairBlue.asset | 16 + .../PlasticChairBlue.asset.meta | 8 + .../PlasticChairGrey.asset | 16 + .../PlasticChairGrey.asset.meta | 8 + .../PosterHorizontal.asset | 16 + .../PosterHorizontal.asset.meta | 8 + .../PosterVertical.asset | 16 + .../PosterVertical.asset.meta | 8 + .../PowerCellCharger.asset | 16 + .../PowerCellCharger.asset.meta | 8 + .../WorldObjectAssetReferences/SMES.asset | 16 + .../SMES.asset.meta | 8 + .../WorldObjectAssetReferences/Scrubber.asset | 16 + .../Scrubber.asset.meta | 8 + .../SecurityAirlock.asset | 16 + .../SecurityAirlock.asset.meta | 8 + .../SecurityLocker.asset | 16 + .../SecurityLocker.asset.meta | 8 + .../WorldObjectAssetReferences/Sink.asset | 16 + .../Sink.asset.meta | 8 + .../SleeperBed.asset | 16 + .../SleeperBed.asset.meta | 8 + .../SlotMachine.asset | 16 + .../SlotMachine.asset.meta | 8 + .../SolarPanel.asset | 16 + .../SolarPanel.asset.meta | 8 + .../SolarTrackingBeacon.asset | 16 + .../SolarTrackingBeacon.asset.meta | 8 + .../TableBoozeDispenser.asset | 16 + .../TableBoozeDispenser.asset.meta | 8 + .../TableFrameSteel.asset | 16 + .../TableFrameSteel.asset.meta | 8 + .../TableFrameWood.asset | 16 + .../TableFrameWood.asset.meta | 8 + .../TableGlass.asset | 16 + .../TableGlass.asset.meta | 8 + .../TablePoker.asset | 16 + .../TablePoker.asset.meta | 8 + .../TableSteel.asset | 16 + .../TableSteel.asset.meta | 8 + .../TableWood.asset | 16 + .../TableWood.asset.meta | 8 + .../WorldObjectAssetReferences/TileBar.asset | 16 + .../TileBar.asset.meta | 8 + .../TileDirt1.asset | 16 + .../TileDirt1.asset.meta | 8 + .../TileGrass.asset | 16 + .../TileGrass.asset.meta | 8 + .../WorldObjectAssetReferences/TileGrey.asset | 16 + .../TileGrey.asset.meta | 8 + .../TileGreyDark.asset | 16 + .../TileGreyDark.asset.meta | 8 + .../TileKitchen.asset | 16 + .../TileKitchen.asset.meta | 8 + .../TileOverlayBlue.asset | 16 + .../TileOverlayBlue.asset.meta | 8 + .../TileOverlayBrown.asset | 16 + .../TileOverlayBrown.asset.meta | 8 + .../TileOverlayGreen.asset | 16 + .../TileOverlayGreen.asset.meta | 8 + .../TileOverlayOrange.asset | 16 + .../TileOverlayOrange.asset.meta | 8 + .../TileOverlayPurple.asset | 16 + .../TileOverlayPurple.asset.meta | 8 + .../TileOverlayRed.asset | 16 + .../TileOverlayRed.asset.meta | 8 + .../TilePlating.asset | 16 + .../TilePlating.asset.meta | 8 + .../TileReinforced.asset | 16 + .../TileReinforced.asset.meta | 8 + .../TileWhite.asset | 16 + .../TileWhite.asset.meta | 8 + .../WorldObjectAssetReferences/TileWood.asset | 16 + .../TileWood.asset.meta | 8 + .../VendorHotDrinks.asset | 16 + .../VendorHotDrinks.asset.meta | 8 + .../VendorRobustSoftdrinks.asset | 16 + .../VendorRobustSoftdrinks.asset.meta | 8 + .../VendorSecTech.asset | 16 + .../VendorSecTech.asset.meta | 8 + .../VendorYouTool.asset | 16 + .../VendorYouTool.asset.meta | 8 + .../WorldObjectAssetReferences/Vent.asset | 16 + .../Vent.asset.meta | 8 + .../WaterCooler.asset | 16 + .../WaterCooler.asset.meta | 8 + .../WaterTank.asset | 16 + .../WaterTank.asset.meta | 8 + Assets/Scripts/SS3D/Data/Generated/Items.cs | 82 +++++ 320 files changed, 2931 insertions(+), 103 deletions(-) create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/APC.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Blender.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Cables.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Locker.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SMES.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Sink.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Vent.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset create mode 100644 Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta diff --git a/Assets/Content/Addressables/AssetGroups/Items.asset b/Assets/Content/Addressables/AssetGroups/Items.asset index b0e9d16cd0..442bd3379b 100644 --- a/Assets/Content/Addressables/AssetGroups/Items.asset +++ b/Assets/Content/Addressables/AssetGroups/Items.asset @@ -385,6 +385,334 @@ MonoBehaviour: m_Address: Assets/Content/WorldObjects/Items/Clothing/ShoeJackboots.prefab m_ReadOnly: 0 m_SerializedLabels: [] + - m_GUID: fdaaabc96a55d824a86a3636906240c1 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Posters/Horizontal/PosterHorizontal.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 85fa4c9b76b4b23458dcf24a745a1dfe + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/DinnerBooth.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 5e24183c4537dcf47b16fde5ab1ce0ea + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayRed.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 4d48472d06930bd42a15897e6a1794ac + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableGlass.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: ebddb1721dcbe36499e4d093e5a7ff09 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TablePoker.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 75680e6a1df5ff547bdb5b8f116f766b + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileBar.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: bdeac5e9a27546348a584caa74f00ec7 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/MachineFrame.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d32855055305ce5489c69379e2219a7d + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/PowerCellCharger.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7c6bebf2e12702d48abd76acad4d1272 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Supply/DisposalOutlet.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 98ce0a84deb394b4bbd18f31f368317c + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Lights/LightBulbFixture.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: a777a6da30f0704478e25312963a8151 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Mirror.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: fa1909e0d40b4cf408ff599df7a2043f + m_Address: Assets/Content/WorldObjects/Furniture/Storage/Lockers/Locker.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 854451834f026fb4f860bf0e977a104c + m_Address: Assets/Content/WorldObjects/Structures/Floors/Lattice.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 5a09b3e93f0022b468da150e3c4a78c6 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Kitchen/Blender.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 3a25eb0bd251b5847af05fb59feff383 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7a47e5b68d8bab647b3f99ee3af524c7 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileGrey.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 081d9ee3e54295d49a4970a88f4943a9 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Medical/Cryotube.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 8686fbdb413e33b4395a775c4f2ba990 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/TilePlating.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 50405f05821f58c49a8badc89506b019 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/SolarTrackingBeacon.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 6f2976f635940684da7f7f4ed7855a8d + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Vendors/VendorSecTech.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 5ecf13819099b014eb5f731155540586 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileKitchen.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 821d0946be816bb42a0eed24631d57ee + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayBlue.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: add4d1bc2d874d94782d6b8c912af5e2 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/NukeCart.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 4a1bd08646e8e1f4a861960d9b7485f8 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7a895b269e3f67241af148d25331f5af + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Office/OfficeChair.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: dd3ce5340ed4aba4babae7020f737084 + m_Address: Assets/Content/WorldObjects/Furniture/Storage/Lockers/SecurityLocker.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 6873d7cf62d6ebc42966423161b799f1 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileGreyDark.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 8ae2f499d25bfcd41bf26b735c852ab1 + m_Address: Assets/Content/WorldObjects/Furniture/Flora/PottedPlants/Plant7.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: de6f06ad18d50134295959f438ba9c5d + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Atmospherics/AtmosPipesL1.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 9b8a1328991fc2846bc55a3d9a82e5c0 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Carpet/FancyCarpetRed.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 66f6206faf2f7fb4a993d935c83fc239 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Lights/LightTubeFixture.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: e9009aff81f29eb429148fd71961539f + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableFrameSteel.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 1e0936c2ffa28eb419deda61c5c1cb8a + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Sink.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 12a989ad41a83a3468d1ae9aff9628d3 + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Disposals/DisposalPipes.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: be5174cd6c3daf64a9739aff0f747a91 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Atmospherics/Scrubber/Scrubber.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 829e74fee2b909242821055cc2b096e0 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Medical/ChemicalDispenser.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: df4cf328d472de046bcbc073cbda2868 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Reinforced/TileReinforced.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: b7976a98a25be4543ba45f1d5e26c072 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Vendors/VendorHotDrinks.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 84a5596b28f449e49bb34741abf89d30 + m_Address: Assets/Content/WorldObjects/Structures/Doors/CivillianAirlock.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 9f028e95d4196b141acf363c01d24806 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Generic/SlotMachine.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 11d64ed349b96ec4780c4dda0ad89daf + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Kitchen/Microwave.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d675e0c37e3147a4b8501314b5106f13 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Generic/Tanks/WaterTank.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 14df766b77b0daf4b82ad93125f66782 + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayPurple.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7b74e45100446b440b4b0a12cd6d05ef + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Kitchen/TableBoozeDispenser.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 49f2097d4710d114a89821d9164dfce2 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Wood/TileWood.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: cc1b7e8558e50594089a64af537ff781 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Vendors/VendorYouTool.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 330d85a67a5891145bd8037dde90f37b + m_Address: Assets/Content/WorldObjects/Furniture/Storage/Lockers/LockerSecure.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 7e7706a54d61daa47857aadd94b37002 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 672b544ba53de0144aab307a16b085cb + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableFrameWood.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 61201f10ccc2856459a9de99d9cdc52e + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Steel/TileWhite.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 3a7b793253e1a0f4587097192998c361 + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayBrown.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: ad124dd2ec7d83344a20a44fad208ca0 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 5e8a02c5ce0073644ac01bdb55d72a70 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableWood.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 23a169aefca62c4418b6efec13df595e + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Supply/DisposalBin.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: f0eca2b8867709749bc10f61917c4bdf + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/SolarPanel.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 501391c27a7f94c4d8c937f00a9ceb9f + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Grass/TileGrass.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 6caa99f8281726e40a793826d5c047db + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Surfaces/Tables/TableSteel.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 45cc43b84ee58e644b9523cb27682b39 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/PacManGenerator.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 11a2276338ebc64429dfc565b491e437 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/AirAlarm.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 51049866c35db47418dfe5e78bee76e7 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: b38ae683afaacc4419ac13936cecd1a5 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Engineering/SMES.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 852d57bdb0508494fb6047f36e813c69 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Generic/Tanks/FuelTank.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 93faf7e7a5c67b9478c57a0d03340256 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Vendors/VendorRobustSoftdrinks.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: adc07a7f0fee8304691f45a201509b13 + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Atmospherics/AtmosPipesL3.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d25b39d1e2379b64cba47629530ada78 + m_Address: Assets/Content/WorldObjects/Structures/Doors/SecurityAirlock.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d27600b4734eb3a4284be037a2f9d02b + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Medical/SleeperBed.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 0d6ab6288624c7348bdcbfb81d07088f + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/Posters/Vertical/PosterVertical.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 251dc2a5fbda518429c8205c3b62165f + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Atmospherics/AtmosPipesL2.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: d07b5fba3896ff448855d6e54356c365 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/LightSwitch.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 8dc5399c58290d54f9a6cc2f6c1c9d9f + m_Address: Assets/Content/WorldObjects/Furniture/Generic/JukeboxBlueGreen.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 0188e95eec8518246940499957802de9 + m_Address: Assets/Content/WorldObjects/Furniture/Generic/WaterCooler.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 48efd00c91c310e4bb965d025c63b3ba + m_Address: Assets/Content/WorldObjects/Structures/Pipes/Atmospherics/AtmosPipesL4.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: ad055c3d74a711a4b9d9b31217883a03 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Kitchen/Gibber.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 50dd6be959d44844ab1abf8a3f2adb01 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/FireAlarm.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 6cd51fc127b8aac40b2accd3e2666202 + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayOrange.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 4c966398d6624164c910cd29c1faa980 + m_Address: Assets/Content/WorldObjects/Structures/WallMounts/APC.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: b3e652487789fe54d8d24245d5962c3a + m_Address: Assets/Content/WorldObjects/Structures/Floors/TileOverlays/TileOverlayGreen.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 0ef9cea3bb74e6c4788f77e711f92d4d + m_Address: Assets/Content/WorldObjects/Structures/Floors/Tiles/Dirt/TileDirt1.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 92d3eb280886ba74cb1e19f4e01669a7 + m_Address: Assets/Content/WorldObjects/Structures/Wires/Cables.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: 41d7af24659a0d3439668aeb4c46d9bc + m_Address: Assets/Content/WorldObjects/Furniture/Flora/PottedPlants/Plant0.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: a28267798293970468ab30803632a3f7 + m_Address: Assets/Content/WorldObjects/Structures/Floors/Catwalk.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + - m_GUID: bb2ccbe283c7a7d459f283a7483e04b9 + m_Address: Assets/Content/WorldObjects/Furniture/Machines/Atmospherics/Vent/Vent.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: ddc57d0f5f9fb874e8a26db0c5b215e0, type: 2} m_SchemaSet: diff --git a/Assets/Content/Data/Databases/Items.asset b/Assets/Content/Data/Databases/Items.asset index 22e0d86fa1..5b9ff50aac 100644 --- a/Assets/Content/Data/Databases/Items.asset +++ b/Assets/Content/Data/Databases/Items.asset @@ -201,4 +201,168 @@ MonoBehaviour: _value: {fileID: 930591319891399865, guid: 81faf4debf00a0a478b924176f48d011, type: 3} - _key: 535ed7c02b5cbdc43ae2b234a963c5cc _value: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} + - _key: fdaaabc96a55d824a86a3636906240c1 + _value: {fileID: 5161561551087789900, guid: fdaaabc96a55d824a86a3636906240c1, type: 3} + - _key: 85fa4c9b76b4b23458dcf24a745a1dfe + _value: {fileID: 8085678556641831659, guid: 85fa4c9b76b4b23458dcf24a745a1dfe, type: 3} + - _key: 5e24183c4537dcf47b16fde5ab1ce0ea + _value: {fileID: 6767447678079105841, guid: 5e24183c4537dcf47b16fde5ab1ce0ea, type: 3} + - _key: 4d48472d06930bd42a15897e6a1794ac + _value: {fileID: 2839728781945606427, guid: 4d48472d06930bd42a15897e6a1794ac, type: 3} + - _key: ebddb1721dcbe36499e4d093e5a7ff09 + _value: {fileID: 3879826479501069436, guid: ebddb1721dcbe36499e4d093e5a7ff09, type: 3} + - _key: 75680e6a1df5ff547bdb5b8f116f766b + _value: {fileID: 6767447678079105841, guid: 75680e6a1df5ff547bdb5b8f116f766b, type: 3} + - _key: bdeac5e9a27546348a584caa74f00ec7 + _value: {fileID: 5860930364823099125, guid: bdeac5e9a27546348a584caa74f00ec7, type: 3} + - _key: d32855055305ce5489c69379e2219a7d + _value: {fileID: 4094910103892312607, guid: d32855055305ce5489c69379e2219a7d, type: 3} + - _key: 7c6bebf2e12702d48abd76acad4d1272 + _value: {fileID: 2658310835758749969, guid: 7c6bebf2e12702d48abd76acad4d1272, type: 3} + - _key: 98ce0a84deb394b4bbd18f31f368317c + _value: {fileID: 4866668043303595546, guid: 98ce0a84deb394b4bbd18f31f368317c, type: 3} + - _key: a777a6da30f0704478e25312963a8151 + _value: {fileID: 4866668043303595546, guid: a777a6da30f0704478e25312963a8151, type: 3} + - _key: fa1909e0d40b4cf408ff599df7a2043f + _value: {fileID: 5533951594911835035, guid: fa1909e0d40b4cf408ff599df7a2043f, type: 3} + - _key: 854451834f026fb4f860bf0e977a104c + _value: {fileID: 7825286949101219487, guid: 854451834f026fb4f860bf0e977a104c, type: 3} + - _key: 5a09b3e93f0022b468da150e3c4a78c6 + _value: {fileID: 1918783493706165866, guid: 5a09b3e93f0022b468da150e3c4a78c6, type: 3} + - _key: 3a25eb0bd251b5847af05fb59feff383 + _value: {fileID: 1694330674204457255, guid: 3a25eb0bd251b5847af05fb59feff383, type: 3} + - _key: 7a47e5b68d8bab647b3f99ee3af524c7 + _value: {fileID: 6767447678079105841, guid: 7a47e5b68d8bab647b3f99ee3af524c7, type: 3} + - _key: 081d9ee3e54295d49a4970a88f4943a9 + _value: {fileID: 3366070093996439494, guid: 081d9ee3e54295d49a4970a88f4943a9, type: 3} + - _key: 8686fbdb413e33b4395a775c4f2ba990 + _value: {fileID: 6767447678079105841, guid: 8686fbdb413e33b4395a775c4f2ba990, type: 3} + - _key: 50405f05821f58c49a8badc89506b019 + _value: {fileID: 1918783493706165866, guid: 50405f05821f58c49a8badc89506b019, type: 3} + - _key: 6f2976f635940684da7f7f4ed7855a8d + _value: {fileID: 2658310835758749969, guid: 6f2976f635940684da7f7f4ed7855a8d, type: 3} + - _key: 5ecf13819099b014eb5f731155540586 + _value: {fileID: 6767447678079105841, guid: 5ecf13819099b014eb5f731155540586, type: 3} + - _key: 821d0946be816bb42a0eed24631d57ee + _value: {fileID: 6767447678079105841, guid: 821d0946be816bb42a0eed24631d57ee, type: 3} + - _key: add4d1bc2d874d94782d6b8c912af5e2 + _value: {fileID: 2658310835758749969, guid: add4d1bc2d874d94782d6b8c912af5e2, type: 3} + - _key: 4a1bd08646e8e1f4a861960d9b7485f8 + _value: {fileID: 5161561551087789900, guid: 4a1bd08646e8e1f4a861960d9b7485f8, type: 3} + - _key: 7a895b269e3f67241af148d25331f5af + _value: {fileID: 5161561551087789900, guid: 7a895b269e3f67241af148d25331f5af, type: 3} + - _key: dd3ce5340ed4aba4babae7020f737084 + _value: {fileID: 5533951594911835035, guid: dd3ce5340ed4aba4babae7020f737084, type: 3} + - _key: 6873d7cf62d6ebc42966423161b799f1 + _value: {fileID: 5554428447677395221, guid: 6873d7cf62d6ebc42966423161b799f1, type: 3} + - _key: 8ae2f499d25bfcd41bf26b735c852ab1 + _value: {fileID: 4182798096333233391, guid: 8ae2f499d25bfcd41bf26b735c852ab1, type: 3} + - _key: de6f06ad18d50134295959f438ba9c5d + _value: {fileID: 2802364579275783218, guid: de6f06ad18d50134295959f438ba9c5d, type: 3} + - _key: 9b8a1328991fc2846bc55a3d9a82e5c0 + _value: {fileID: 3591147544166670882, guid: 9b8a1328991fc2846bc55a3d9a82e5c0, type: 3} + - _key: 66f6206faf2f7fb4a993d935c83fc239 + _value: {fileID: 4866668043303595546, guid: 66f6206faf2f7fb4a993d935c83fc239, type: 3} + - _key: e9009aff81f29eb429148fd71961539f + _value: {fileID: 3879826479501069436, guid: e9009aff81f29eb429148fd71961539f, type: 3} + - _key: 1e0936c2ffa28eb419deda61c5c1cb8a + _value: {fileID: 1918783493706165866, guid: 1e0936c2ffa28eb419deda61c5c1cb8a, type: 3} + - _key: 12a989ad41a83a3468d1ae9aff9628d3 + _value: {fileID: 2802364579275783218, guid: 12a989ad41a83a3468d1ae9aff9628d3, type: 3} + - _key: be5174cd6c3daf64a9739aff0f747a91 + _value: {fileID: 9154955770433736351, guid: be5174cd6c3daf64a9739aff0f747a91, type: 3} + - _key: 829e74fee2b909242821055cc2b096e0 + _value: {fileID: 2314780735993174911, guid: 829e74fee2b909242821055cc2b096e0, type: 3} + - _key: df4cf328d472de046bcbc073cbda2868 + _value: {fileID: 8597721773267636030, guid: df4cf328d472de046bcbc073cbda2868, type: 3} + - _key: b7976a98a25be4543ba45f1d5e26c072 + _value: {fileID: 2658310835758749969, guid: b7976a98a25be4543ba45f1d5e26c072, type: 3} + - _key: 84a5596b28f449e49bb34741abf89d30 + _value: {fileID: 7133738675197207439, guid: 84a5596b28f449e49bb34741abf89d30, type: 3} + - _key: 9f028e95d4196b141acf363c01d24806 + _value: {fileID: 2979169873714900079, guid: 9f028e95d4196b141acf363c01d24806, type: 3} + - _key: 11d64ed349b96ec4780c4dda0ad89daf + _value: {fileID: 1918783493706165866, guid: 11d64ed349b96ec4780c4dda0ad89daf, type: 3} + - _key: d675e0c37e3147a4b8501314b5106f13 + _value: {fileID: 2473656465330762349, guid: d675e0c37e3147a4b8501314b5106f13, type: 3} + - _key: 14df766b77b0daf4b82ad93125f66782 + _value: {fileID: 6767447678079105841, guid: 14df766b77b0daf4b82ad93125f66782, type: 3} + - _key: 7b74e45100446b440b4b0a12cd6d05ef + _value: {fileID: 1918783493706165866, guid: 7b74e45100446b440b4b0a12cd6d05ef, type: 3} + - _key: 49f2097d4710d114a89821d9164dfce2 + _value: {fileID: 6767447678079105841, guid: 49f2097d4710d114a89821d9164dfce2, type: 3} + - _key: cc1b7e8558e50594089a64af537ff781 + _value: {fileID: 2658310835758749969, guid: cc1b7e8558e50594089a64af537ff781, type: 3} + - _key: 330d85a67a5891145bd8037dde90f37b + _value: {fileID: 5533951594911835035, guid: 330d85a67a5891145bd8037dde90f37b, type: 3} + - _key: 7e7706a54d61daa47857aadd94b37002 + _value: {fileID: 425175355485335577, guid: 7e7706a54d61daa47857aadd94b37002, type: 3} + - _key: 672b544ba53de0144aab307a16b085cb + _value: {fileID: 3879826479501069436, guid: 672b544ba53de0144aab307a16b085cb, type: 3} + - _key: 61201f10ccc2856459a9de99d9cdc52e + _value: {fileID: 6767447678079105841, guid: 61201f10ccc2856459a9de99d9cdc52e, type: 3} + - _key: 3a7b793253e1a0f4587097192998c361 + _value: {fileID: 6767447678079105841, guid: 3a7b793253e1a0f4587097192998c361, type: 3} + - _key: ad124dd2ec7d83344a20a44fad208ca0 + _value: {fileID: 4522437496122700672, guid: ad124dd2ec7d83344a20a44fad208ca0, type: 3} + - _key: 5e8a02c5ce0073644ac01bdb55d72a70 + _value: {fileID: 3879826479501069436, guid: 5e8a02c5ce0073644ac01bdb55d72a70, type: 3} + - _key: 23a169aefca62c4418b6efec13df595e + _value: {fileID: 2658310835758749969, guid: 23a169aefca62c4418b6efec13df595e, type: 3} + - _key: f0eca2b8867709749bc10f61917c4bdf + _value: {fileID: 941367499997148975, guid: f0eca2b8867709749bc10f61917c4bdf, type: 3} + - _key: 501391c27a7f94c4d8c937f00a9ceb9f + _value: {fileID: 6767447678079105841, guid: 501391c27a7f94c4d8c937f00a9ceb9f, type: 3} + - _key: 6caa99f8281726e40a793826d5c047db + _value: {fileID: 8036950609662249464, guid: 6caa99f8281726e40a793826d5c047db, type: 3} + - _key: 45cc43b84ee58e644b9523cb27682b39 + _value: {fileID: 1918783493706165866, guid: 45cc43b84ee58e644b9523cb27682b39, type: 3} + - _key: 11a2276338ebc64429dfc565b491e437 + _value: {fileID: 6961426338783081091, guid: 11a2276338ebc64429dfc565b491e437, type: 3} + - _key: 51049866c35db47418dfe5e78bee76e7 + _value: {fileID: 2552998557361554814, guid: 51049866c35db47418dfe5e78bee76e7, type: 3} + - _key: b38ae683afaacc4419ac13936cecd1a5 + _value: {fileID: 1918783493706165866, guid: b38ae683afaacc4419ac13936cecd1a5, type: 3} + - _key: 852d57bdb0508494fb6047f36e813c69 + _value: {fileID: 1918783493706165866, guid: 852d57bdb0508494fb6047f36e813c69, type: 3} + - _key: 93faf7e7a5c67b9478c57a0d03340256 + _value: {fileID: 2658310835758749969, guid: 93faf7e7a5c67b9478c57a0d03340256, type: 3} + - _key: adc07a7f0fee8304691f45a201509b13 + _value: {fileID: 2802364579275783218, guid: adc07a7f0fee8304691f45a201509b13, type: 3} + - _key: d25b39d1e2379b64cba47629530ada78 + _value: {fileID: 7133738675197207439, guid: d25b39d1e2379b64cba47629530ada78, type: 3} + - _key: d27600b4734eb3a4284be037a2f9d02b + _value: {fileID: 7357446777869910137, guid: d27600b4734eb3a4284be037a2f9d02b, type: 3} + - _key: 0d6ab6288624c7348bdcbfb81d07088f + _value: {fileID: 5927714388255546572, guid: 0d6ab6288624c7348bdcbfb81d07088f, type: 3} + - _key: 251dc2a5fbda518429c8205c3b62165f + _value: {fileID: 2802364579275783218, guid: 251dc2a5fbda518429c8205c3b62165f, type: 3} + - _key: d07b5fba3896ff448855d6e54356c365 + _value: {fileID: 4866668043303595546, guid: d07b5fba3896ff448855d6e54356c365, type: 3} + - _key: 8dc5399c58290d54f9a6cc2f6c1c9d9f + _value: {fileID: 6118765911134750290, guid: 8dc5399c58290d54f9a6cc2f6c1c9d9f, type: 3} + - _key: 0188e95eec8518246940499957802de9 + _value: {fileID: 260173893888736664, guid: 0188e95eec8518246940499957802de9, type: 3} + - _key: 48efd00c91c310e4bb965d025c63b3ba + _value: {fileID: 2802364579275783218, guid: 48efd00c91c310e4bb965d025c63b3ba, type: 3} + - _key: ad055c3d74a711a4b9d9b31217883a03 + _value: {fileID: 8859943380013583148, guid: ad055c3d74a711a4b9d9b31217883a03, type: 3} + - _key: 50dd6be959d44844ab1abf8a3f2adb01 + _value: {fileID: 4866668043303595546, guid: 50dd6be959d44844ab1abf8a3f2adb01, type: 3} + - _key: 6cd51fc127b8aac40b2accd3e2666202 + _value: {fileID: 6767447678079105841, guid: 6cd51fc127b8aac40b2accd3e2666202, type: 3} + - _key: 4c966398d6624164c910cd29c1faa980 + _value: {fileID: 5287103069661579500, guid: 4c966398d6624164c910cd29c1faa980, type: 3} + - _key: b3e652487789fe54d8d24245d5962c3a + _value: {fileID: 6767447678079105841, guid: b3e652487789fe54d8d24245d5962c3a, type: 3} + - _key: 0ef9cea3bb74e6c4788f77e711f92d4d + _value: {fileID: 6767447678079105841, guid: 0ef9cea3bb74e6c4788f77e711f92d4d, type: 3} + - _key: 92d3eb280886ba74cb1e19f4e01669a7 + _value: {fileID: 2802364579275783218, guid: 92d3eb280886ba74cb1e19f4e01669a7, type: 3} + - _key: 41d7af24659a0d3439668aeb4c46d9bc + _value: {fileID: 4182798096333233391, guid: 41d7af24659a0d3439668aeb4c46d9bc, type: 3} + - _key: a28267798293970468ab30803632a3f7 + _value: {fileID: 8178185248287418974, guid: a28267798293970468ab30803632a3f7, type: 3} + - _key: bb2ccbe283c7a7d459f283a7483e04b9 + _value: {fileID: 9154955770433736351, guid: bb2ccbe283c7a7d459f283a7483e04b9, type: 3} _new: diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant0.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant0.asset index 9d5bb2f4cc..40199d4d4b 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant0.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant0.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Plant0 m_EditorClassIdentifier: - nameString: plant0 prefab: {fileID: 4182798096333233391, guid: 41d7af24659a0d3439668aeb4c46d9bc, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7f81f6e487d7acc449f47ee1bb0c8cb7, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant7.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant7.asset index d8998b8303..c0c4cb2ccf 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant7.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Flora/PottedPlants/Plant7.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Plant7 m_EditorClassIdentifier: - nameString: plant7 prefab: {fileID: 4182798096333233391, guid: 8ae2f499d25bfcd41bf26b735c852ab1, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9f69d24f5d22e8a4ebc1e60eb6c74d98, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/JukeboxBlueGreen.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/JukeboxBlueGreen.asset index 4d4d3f2939..c39215b46b 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/JukeboxBlueGreen.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/JukeboxBlueGreen.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: JukeboxBlueGreen m_EditorClassIdentifier: - nameString: JukeboxBlueGreen prefab: {fileID: 6118765911134750290, guid: 8dc5399c58290d54f9a6cc2f6c1c9d9f, type: 3} + PrefabAsset: {fileID: 11400000, guid: f7b11732c4258a14a99087cbbc175eab, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/NukeCart.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/NukeCart.asset index 92c5d349cd..9bcae77f55 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/NukeCart.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/NukeCart.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: NukeCart m_EditorClassIdentifier: - nameString: nuke_cart prefab: {fileID: 2658310835758749969, guid: add4d1bc2d874d94782d6b8c912af5e2, type: 3} + PrefabAsset: {fileID: 11400000, guid: 429460ce2249f9f438cf31c6ef35b298, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChair.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChair.asset index 9d6ea82f9c..f08960dabc 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChair.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChair.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: OfficeChair m_EditorClassIdentifier: - nameString: chair_office prefab: {fileID: 5161561551087789900, guid: 7a895b269e3f67241af148d25331f5af, type: 3} + PrefabAsset: {fileID: 11400000, guid: d9b535e0cb6122741bab6b987207a626, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.asset index 329c0fbc18..7048f49403 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairBlue.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: OfficeChairBlue m_EditorClassIdentifier: - nameString: chair_office_blue prefab: {fileID: 2552998557361554814, guid: 51049866c35db47418dfe5e78bee76e7, type: 3} + PrefabAsset: {fileID: 11400000, guid: cb3ca8be4114e4d409b3d69fae2f9428, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.asset index 0aa4152f7a..91ea750d05 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Office/OfficeChairGrey.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: OfficeChairGrey m_EditorClassIdentifier: - nameString: chair_office_grey prefab: {fileID: 425175355485335577, guid: 7e7706a54d61daa47857aadd94b37002, type: 3} + PrefabAsset: {fileID: 11400000, guid: d1ce84881d67528419ccb2f2947dc17c, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.asset index 917e463a83..02bb949601 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChair.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: PlasticChair m_EditorClassIdentifier: - nameString: chair_plastic prefab: {fileID: 5161561551087789900, guid: 4a1bd08646e8e1f4a861960d9b7485f8, type: 3} + PrefabAsset: {fileID: 11400000, guid: f62fbce52ff26fc449c2c38c1c759004, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.asset index fef22208ef..c0e4269a3c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairBlue.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: PlasticChairBlue m_EditorClassIdentifier: - nameString: chair_plastic_blue prefab: {fileID: 4522437496122700672, guid: ad124dd2ec7d83344a20a44fad208ca0, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8c0f778498a9baa4ebc43a943c97a314, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.asset index 9d37e7a92f..f77a0891c4 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/Chairs/Plastic/PlasticChairGrey.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: PlasticChairGrey m_EditorClassIdentifier: - nameString: chair_plastic_grey prefab: {fileID: 1694330674204457255, guid: 3a25eb0bd251b5847af05fb59feff383, type: 3} + PrefabAsset: {fileID: 11400000, guid: c830ff804dedfcb48aded18665c08225, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset index 25d401f247..b15b876217 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Seats/DinnerBooth.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: DinnerBooth m_EditorClassIdentifier: - nameString: DinnerBooth prefab: {fileID: 8085678556641831659, guid: 85fa4c9b76b4b23458dcf24a745a1dfe, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4467e57350dc14745b7ef76c60fd8001, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 5 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Sink.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Sink.asset index de3aedd2cf..7aaa188040 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Sink.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Sink.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: Sink m_EditorClassIdentifier: prefab: {fileID: 1918783493706165866, guid: 1e0936c2ffa28eb419deda61c5c1cb8a, type: 3} + PrefabAsset: {fileID: 11400000, guid: b0b8c9665d651934382cdad26ffa8081, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameSteel.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameSteel.asset index 548ecee1e3..a4629a60bf 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameSteel.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameSteel.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableFrameSteel m_EditorClassIdentifier: - nameString: tableframe_steel prefab: {fileID: 3879826479501069436, guid: e9009aff81f29eb429148fd71961539f, type: 3} + PrefabAsset: {fileID: 11400000, guid: c4e3ed17ef66be443b04296dab2a7ae5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameWood.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameWood.asset index a15e330115..865eac9ce7 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameWood.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableFrameWood.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableFrameWood m_EditorClassIdentifier: - nameString: tableframe_wood prefab: {fileID: 3879826479501069436, guid: 672b544ba53de0144aab307a16b085cb, type: 3} + PrefabAsset: {fileID: 11400000, guid: a7a0afa03215be246be78ab71e2e2571, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 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 index 5f181fcd2f..bb148cc14c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableGlass.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableGlass.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableGlass m_EditorClassIdentifier: - nameString: table_glass prefab: {fileID: 2839728781945606427, guid: 4d48472d06930bd42a15897e6a1794ac, type: 3} + PrefabAsset: {fileID: 11400000, guid: 57eec9e75508e354f8d240e6c7dfc96a, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 7 specificType: 1 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TablePoker.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TablePoker.asset index ad50653bbf..e4823a7fa3 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TablePoker.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TablePoker.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TablePoker m_EditorClassIdentifier: - nameString: table_poker prefab: {fileID: 3879826479501069436, guid: ebddb1721dcbe36499e4d093e5a7ff09, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3ba25a1b639ddcd489a491e3bbc3eb03, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 7 specificType: 2 width: 1 height: 1 + isLarge: 0 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 index 0f2e7072ea..2bc815e71d 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableSteel.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableSteel.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableSteel m_EditorClassIdentifier: - nameString: table_steel prefab: {fileID: 8036950609662249464, guid: 6caa99f8281726e40a793826d5c047db, type: 3} + PrefabAsset: {fileID: 11400000, guid: f3930eec4b86e7746a89c6c716e27798, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 7 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableWood.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableWood.asset index c8aa45c947..6460f4146c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableWood.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/Surfaces/Tables/TableWood.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableWood m_EditorClassIdentifier: - nameString: table_wood prefab: {fileID: 3879826479501069436, guid: 5e8a02c5ce0073644ac01bdb55d72a70, type: 3} + PrefabAsset: {fileID: 11400000, guid: 00bc0b62e52334e43b318cac04a821cf, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 7 specificType: 4 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/WaterCooler.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/WaterCooler.asset index 9ae5449342..ebe213df1c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Generic/WaterCooler.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Generic/WaterCooler.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: WaterCooler m_EditorClassIdentifier: - nameString: water_cooler prefab: {fileID: 260173893888736664, guid: 0188e95eec8518246940499957802de9, type: 3} + PrefabAsset: {fileID: 11400000, guid: e00ebdb1aa55d3a40ab6a8c03d1d0529, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Scrubber.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Scrubber.asset index ca3ce3e097..5114e9dcbd 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Scrubber.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Scrubber.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Scrubber m_EditorClassIdentifier: - nameString: scrubber prefab: {fileID: 9154955770433736351, guid: be5174cd6c3daf64a9739aff0f747a91, type: 3} + PrefabAsset: {fileID: 11400000, guid: b10b6c6238a5a814ba6737bfa63bc4c3, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Vent.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Vent.asset index bcbff1ce5e..4646952885 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Vent.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Atmospherics/Vent.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Vent m_EditorClassIdentifier: - nameString: vent prefab: {fileID: 9154955770433736351, guid: bb2ccbe283c7a7d459f283a7483e04b9, type: 3} + PrefabAsset: {fileID: 11400000, guid: c05dfac29f4de184e8dcb9be586d1d72, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PacManGenerator.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PacManGenerator.asset index a02cd38ffb..7786b2c2c8 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PacManGenerator.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PacManGenerator.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: PacManGenerator m_EditorClassIdentifier: - nameString: PacManGenerator prefab: {fileID: 1918783493706165866, guid: 45cc43b84ee58e644b9523cb27682b39, type: 3} + PrefabAsset: {fileID: 11400000, guid: 70c5d3dd9aae4924ca510544b02d153f, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PowerCellCharger.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PowerCellCharger.asset index a7a5d19ef1..2fcb17dcea 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PowerCellCharger.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/PowerCellCharger.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: PowerCellCharger m_EditorClassIdentifier: prefab: {fileID: 4094910103892312607, guid: d32855055305ce5489c69379e2219a7d, type: 3} + PrefabAsset: {fileID: 11400000, guid: 927209024a2e722458a308e2433956cb, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SMES.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SMES.asset index 669e0d6920..70e1c61632 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SMES.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SMES.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SMES m_EditorClassIdentifier: - nameString: SMES prefab: {fileID: 1918783493706165866, guid: b38ae683afaacc4419ac13936cecd1a5, type: 3} + PrefabAsset: {fileID: 11400000, guid: 2b02816e423698b4590effe2b46616a4, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarPanel.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarPanel.asset index 504bfe3455..741014a737 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarPanel.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarPanel.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: SolarPanel m_EditorClassIdentifier: prefab: {fileID: 941367499997148975, guid: f0eca2b8867709749bc10f61917c4bdf, type: 3} + PrefabAsset: {fileID: 11400000, guid: 38fc09810330bbd4bba345e3f9592199, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarTrackingBeacon.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarTrackingBeacon.asset index 3b8ad57b4b..d917319a73 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarTrackingBeacon.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Engineering/SolarTrackingBeacon.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SolarTrackingBeacon m_EditorClassIdentifier: - nameString: SolarTrackingBeacon prefab: {fileID: 1918783493706165866, guid: 50405f05821f58c49a8badc89506b019, type: 3} + PrefabAsset: {fileID: 11400000, guid: b27d3b93e8709f840a9f1aab59a9cc75, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/SlotMachine.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/SlotMachine.asset index e7b7db10c0..cb188f39d9 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/SlotMachine.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/SlotMachine.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: SlotMachine m_EditorClassIdentifier: prefab: {fileID: 2979169873714900079, guid: 9f028e95d4196b141acf363c01d24806, type: 3} + PrefabAsset: {fileID: 11400000, guid: ad014a0995d51f64992e3022889cf64d, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/FuelTank.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/FuelTank.asset index 8e3ddb9e16..afc86d129b 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/FuelTank.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/FuelTank.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: FuelTank m_EditorClassIdentifier: prefab: {fileID: 1918783493706165866, guid: 852d57bdb0508494fb6047f36e813c69, type: 3} + PrefabAsset: {fileID: 11400000, guid: 96ca9ccd597fc434d8b4c00f1143ebee, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/WaterTank.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/WaterTank.asset index 87559ca696..f1607e7231 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/WaterTank.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Generic/Tanks/WaterTank.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: WaterTank m_EditorClassIdentifier: prefab: {fileID: 2473656465330762349, guid: d675e0c37e3147a4b8501314b5106f13, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3b3e7d5b83122c048bf3679e7e38edd2, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Blender.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Blender.asset index 3c89808a60..45ff0c1eca 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Blender.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Blender.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Blender m_EditorClassIdentifier: - nameString: blender prefab: {fileID: 1918783493706165866, guid: 5a09b3e93f0022b468da150e3c4a78c6, type: 3} + PrefabAsset: {fileID: 11400000, guid: c106e3753ddf7bf478a44b1b84e29a75, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Gibber.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Gibber.asset index b915ae8ab2..2ee659fd58 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Gibber.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Gibber.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: Gibber m_EditorClassIdentifier: prefab: {fileID: 8859943380013583148, guid: ad055c3d74a711a4b9d9b31217883a03, type: 3} + PrefabAsset: {fileID: 11400000, guid: b207b8ee084b79b4596fdecc5de5c8dd, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Microwave.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Microwave.asset index a13d60c42b..f6433cbcea 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Microwave.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/Microwave.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Microwave m_EditorClassIdentifier: - nameString: microwave prefab: {fileID: 1918783493706165866, guid: 11d64ed349b96ec4780c4dda0ad89daf, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6dc7a600d222dc644ae89ef4a09f9b8d, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/TableBoozeDispenser.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/TableBoozeDispenser.asset index 857ea8f7ed..520640b9c7 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/TableBoozeDispenser.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Kitchen/TableBoozeDispenser.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TableBoozeDispenser m_EditorClassIdentifier: - nameString: boozedispenser_table prefab: {fileID: 1918783493706165866, guid: 7b74e45100446b440b4b0a12cd6d05ef, type: 3} + PrefabAsset: {fileID: 11400000, guid: a73deecf4da493441be493a67fe479ba, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/MachineFrame.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/MachineFrame.asset index 91f4d7bd77..0f2e57571e 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/MachineFrame.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/MachineFrame.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: MachineFrame m_EditorClassIdentifier: prefab: {fileID: 5860930364823099125, guid: bdeac5e9a27546348a584caa74f00ec7, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7965545d91b399842b227ff775f06b33, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/ChemicalDispenser.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/ChemicalDispenser.asset index 3949f2330f..4a8c5b9187 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/ChemicalDispenser.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/ChemicalDispenser.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: ChemicalDispenser m_EditorClassIdentifier: prefab: {fileID: 2314780735993174911, guid: 829e74fee2b909242821055cc2b096e0, type: 3} + PrefabAsset: {fileID: 11400000, guid: d1f5ecddf221c1a47982808266f2070c, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/Cryotube.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/Cryotube.asset index e791bebb8f..770e3659c9 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/Cryotube.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/Cryotube.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: Cryotube m_EditorClassIdentifier: prefab: {fileID: 3366070093996439494, guid: 081d9ee3e54295d49a4970a88f4943a9, type: 3} + PrefabAsset: {fileID: 11400000, guid: 47922ffa76b90df46b58005fe77de084, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/SleeperBed.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/SleeperBed.asset index 5992c452f7..dc0c66d6b6 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/SleeperBed.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Medical/SleeperBed.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: SleeperBed m_EditorClassIdentifier: prefab: {fileID: 7357446777869910137, guid: d27600b4734eb3a4284be037a2f9d02b, type: 3} + PrefabAsset: {fileID: 11400000, guid: ba51a5776f8c1d942925425a344831a5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalBin.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalBin.asset index 988ba59f74..f948537f53 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalBin.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalBin.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: DisposalBin m_EditorClassIdentifier: - nameString: disposal_bin prefab: {fileID: 2658310835758749969, guid: 23a169aefca62c4418b6efec13df595e, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4e13680fe42def4449c8d79dc3318818, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalOutlet.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalOutlet.asset index 0ba5d0524d..8531c853a4 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalOutlet.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Supply/DisposalOutlet.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: DisposalOutlet m_EditorClassIdentifier: - nameString: disposal_outlet prefab: {fileID: 2658310835758749969, guid: 7c6bebf2e12702d48abd76acad4d1272, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6fa242ef9bd905b4b8ba6b969a50c17e, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorHotDrinks.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorHotDrinks.asset index 8d4c0855c3..b266167453 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorHotDrinks.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorHotDrinks.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: VendorHotDrinks m_EditorClassIdentifier: - nameString: vendor_hotdrinks prefab: {fileID: 2658310835758749969, guid: b7976a98a25be4543ba45f1d5e26c072, type: 3} + PrefabAsset: {fileID: 11400000, guid: 147f3795b10839d4cbcc1d34086d1b1f, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorRobustSoftdrinks.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorRobustSoftdrinks.asset index 6247179e29..9e73eb7e0f 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorRobustSoftdrinks.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorRobustSoftdrinks.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: VendorRobustSoftdrinks m_EditorClassIdentifier: - nameString: vendor_robustsoftdrinks prefab: {fileID: 2658310835758749969, guid: 93faf7e7a5c67b9478c57a0d03340256, type: 3} + PrefabAsset: {fileID: 11400000, guid: 2bef70bf5ad92da45afa079fa69185b5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorSecTech.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorSecTech.asset index 7e609c0699..7d7e87ddc0 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorSecTech.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorSecTech.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: VendorSecTech m_EditorClassIdentifier: - nameString: vendor_sectech prefab: {fileID: 2658310835758749969, guid: 6f2976f635940684da7f7f4ed7855a8d, type: 3} + PrefabAsset: {fileID: 11400000, guid: 32c17bc4bdd2e8a43a4957440b5a1822, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorYouTool.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorYouTool.asset index 93385b4a8c..270a406b1c 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorYouTool.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Machines/Vendors/VendorYouTool.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: VendorYouTool m_EditorClassIdentifier: - nameString: vendor_youtool prefab: {fileID: 2658310835758749969, guid: cc1b7e8558e50594089a64af537ff781, type: 3} + PrefabAsset: {fileID: 11400000, guid: f4e9603aa7cef9341be50d058b95d0d5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/Locker.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/Locker.asset index 1d1d31773d..34c305dd41 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/Locker.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/Locker.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Locker m_EditorClassIdentifier: - nameString: locker prefab: {fileID: 5533951594911835035, guid: fa1909e0d40b4cf408ff599df7a2043f, type: 3} + PrefabAsset: {fileID: 11400000, guid: f994423a5d0fd1e41858be3166101149, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecureLocker.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecureLocker.asset index 99bd606e08..321bc60909 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecureLocker.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecureLocker.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SecureLocker m_EditorClassIdentifier: - nameString: locker_secure prefab: {fileID: 5533951594911835035, guid: 330d85a67a5891145bd8037dde90f37b, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3804d158eb924df468d8ebd0c01da9bb, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecurityLocker.asset b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecurityLocker.asset index 7fb5b52d1d..1fb830e3d3 100644 --- a/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecurityLocker.asset +++ b/Assets/Content/Data/TileMap/Resources/Furniture/Storage/Lockers/SecurityLocker.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SecurityLocker m_EditorClassIdentifier: - nameString: locker_security prefab: {fileID: 5533951594911835035, guid: dd3ce5340ed4aba4babae7020f737084, type: 3} + PrefabAsset: {fileID: 11400000, guid: 534d22d36c7a7df49adb294f3e2118a5, type: 2} icon: {fileID: 0} + _nameString: layer: 7 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Backpack.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Backpack.asset index 8a8ae84c0f..30999c216f 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Backpack.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Backpack.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Backpack m_EditorClassIdentifier: - nameString: Backpack prefab: {fileID: 802333698458937824, guid: ddaa28fac1956b2428aff1dac1d89707, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9435365903a79d64184af9ee71e060e5, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/GasMask.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/GasMask.asset index 71c1e9fa7c..f1c16cd3a5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/GasMask.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/GasMask.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: GasMask m_EditorClassIdentifier: - nameString: GasMask prefab: {fileID: 1687938131941834081, guid: bf177f8bab26bc84b87fd9a971004418, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4a50e327a934cd3438e1b88d2bb547cb, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/GloveInsulated.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/GloveInsulated.asset index 532f61c79c..bee78fabca 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/GloveInsulated.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/GloveInsulated.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: GloveInsulated m_EditorClassIdentifier: prefab: {fileID: 4581819739591165899, guid: 65679cf5a30d6dd458666804af7c3ca3, type: 3} + PrefabAsset: {fileID: 11400000, guid: 55deb25596d5d314b8b7dd58eafb8aec, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Headset.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Headset.asset index 9915bca51c..b40cc3de1c 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Headset.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Headset.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Headset m_EditorClassIdentifier: prefab: {fileID: 8712940276313799639, guid: db15899bc1eb2794fb2b24129852a209, type: 3} + PrefabAsset: {fileID: 11400000, guid: f2914f9670967764e93aa1b262968344, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/HeadsetSecurity.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/HeadsetSecurity.asset index 4e4f2de821..e809d1f3ee 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/HeadsetSecurity.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/HeadsetSecurity.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: HeadsetSecurity m_EditorClassIdentifier: prefab: {fileID: 5049739216948387840, guid: a38ee818c953a404787757d8d20d2851, type: 3} + PrefabAsset: {fileID: 11400000, guid: 5e0824505970aa040a1780b6e80e4630, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitBotany.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitBotany.asset index 0b5a7d045c..1ca47e9b31 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitBotany.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitBotany.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: JumpsuitBotany m_EditorClassIdentifier: prefab: {fileID: 8312388220934557560, guid: be3fcf1a74268ad49bfedb1edd9f5318, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6a9a8af0ce91a634ab42f12ebc7b24a6, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitEngineer.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitEngineer.asset index 54fc992d0d..1da0000a06 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitEngineer.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitEngineer.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: JumpsuitEngineer m_EditorClassIdentifier: prefab: {fileID: 4245634344425516727, guid: 7436f4976849b994aaee40df1bca7d89, type: 3} + PrefabAsset: {fileID: 11400000, guid: c3e196c40ac645e4d840edb82a27baf9, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitGrey.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitGrey.asset index 53d2daaf8e..55ada87c70 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitGrey.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitGrey.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: JumpsuitGrey m_EditorClassIdentifier: prefab: {fileID: 624365323667193292, guid: 236b51ddc6f9aa94ca92579082370c06, type: 3} + PrefabAsset: {fileID: 11400000, guid: 620dc53a5608be44a975c990e69ddba5, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitSecurity.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitSecurity.asset index bc035edbba..e60c744606 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitSecurity.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/JumpsuitSecurity.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: JumpsuitSecurity m_EditorClassIdentifier: prefab: {fileID: 6330158209413936013, guid: 93ad90421a3b2f64e8fdb9e95a42ba90, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9abef62d6f4edd443b3fa81a32f9a5ba, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeHiTop.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeHiTop.asset index 947a09f0ac..e0bc387155 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeHiTop.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeHiTop.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: ShoeHiTop m_EditorClassIdentifier: prefab: {fileID: 930591319891399865, guid: 81faf4debf00a0a478b924176f48d011, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7877ae994c8a31244bf59b1b971caaa5, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeJackboots.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeJackboots.asset index b98e2af2d7..40448d4ab5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeJackboots.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ShoeJackboots.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: ShoeJackboots m_EditorClassIdentifier: prefab: {fileID: 2653363475000095017, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7514f2bc5fd84a14095929761da0a4dd, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Sunglasses.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Sunglasses.asset index b549afec95..089a1c1fa5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/Sunglasses.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/Sunglasses.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Sunglasses m_EditorClassIdentifier: - nameString: Sunglasses prefab: {fileID: 2667451333340596270, guid: 9b9f6bd470226a74b903e74dbe9e423a, type: 3} + PrefabAsset: {fileID: 11400000, guid: c0a5c4fc200a5ae4693d9b02fee23b49, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ToolBelt.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ToolBelt.asset index 0b3ec08ad6..68fa11481d 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/ToolBelt.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/ToolBelt.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: ToolBelt m_EditorClassIdentifier: - nameString: ToolBelt prefab: {fileID: 1080889307602868191, guid: 40d904629802fc942860ce878e78efef, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9cf2801a7b335074190840fc9112d582, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Clothing/TruckerCap.asset b/Assets/Content/Data/TileMap/Resources/Items/Clothing/TruckerCap.asset index 72d11b9248..6efb3bec1d 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Clothing/TruckerCap.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Clothing/TruckerCap.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: TruckerCap m_EditorClassIdentifier: - nameString: TruckerCap prefab: {fileID: 2601952054522247362, guid: 1ef3c21a685ec2d4e9f0876719839d5f, type: 3} + PrefabAsset: {fileID: 11400000, guid: e53ebba96eeba474e8478131c8d24085, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BrutePatch.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BrutePatch.asset index 394d55ab40..cbea2d9e44 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BrutePatch.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BrutePatch.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: BrutePatch m_EditorClassIdentifier: prefab: {fileID: 4068007204767187790, guid: b5be0a52925e2674193d081d2deb68cb, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8ec2a780fae01344a9431a9cb06d8a7c, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BurnPatch.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BurnPatch.asset index 2d6652e8f4..b8644fba3c 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BurnPatch.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/BurnPatch.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: BurnPatch m_EditorClassIdentifier: prefab: {fileID: 4068007204767187790, guid: 162e188d33a82b440a239f20901c716a, type: 3} + PrefabAsset: {fileID: 11400000, guid: e28b644ad26ceae45acf3ceb84b8cbff, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/MedicalPatch.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/MedicalPatch.asset index 5fe7bc4798..de4d9eecbc 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/MedicalPatch.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Chemical/MedicalPatch.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: MedicalPatch m_EditorClassIdentifier: prefab: {fileID: 4068007204767187790, guid: 2332a158259900e4f8a237fa8daff266, type: 3} + PrefabAsset: {fileID: 11400000, guid: 1a9f9df755637c3478bf4649e7ab04fd, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepsSoda.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepsSoda.asset index 1e6ad76d94..76cd701e55 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepsSoda.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepsSoda.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanBeepsSoda m_EditorClassIdentifier: - nameString: soda_beepsoda prefab: {fileID: 4482577744063562115, guid: f490a74616c067c4f83995017e10b420, type: 3} + PrefabAsset: {fileID: 11400000, guid: bffc6c08d28041549ae1af640b76ce92, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepyLime.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepyLime.asset index 6d46f0956a..6e4ebcaf1c 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepyLime.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanBeepyLime.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanBeepyLime m_EditorClassIdentifier: - nameString: soda_beepylime prefab: {fileID: 6405503896595845848, guid: 4e6899916bc8fd742a07f32b3a04de12, type: 3} + PrefabAsset: {fileID: 11400000, guid: e41bbba3e5f86d342a514665e8eeba56, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedAir.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedAir.asset index e078c081e5..4750a8bb66 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedAir.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedAir.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanCannedAir m_EditorClassIdentifier: - nameString: soda_cannedair prefab: {fileID: 5774385816057912484, guid: e4281cb43d1443d4388737777fdd98d8, type: 3} + PrefabAsset: {fileID: 11400000, guid: d5ed3684908f1d846815d39a4ae98418, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedLaughter.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedLaughter.asset index f1c4d03711..e21dba5731 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedLaughter.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCannedLaughter.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanCannedLaughter m_EditorClassIdentifier: - nameString: soda_cannedlaughter prefab: {fileID: 8047892061280000217, guid: dceb056e41b5c634f9933423de8e075c, type: 3} + PrefabAsset: {fileID: 11400000, guid: e6c8ce8c1b83a004389647756897a0c0, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCola.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCola.asset index b99d3d41a2..943c51a773 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCola.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanCola.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanCola m_EditorClassIdentifier: - nameString: soda_cola prefab: {fileID: 3995435954105705608, guid: 92d6696a323ef66448190e8e9d69fd22, type: 3} + PrefabAsset: {fileID: 11400000, guid: 1c4488c42b15c364b91b3ebc97c3a840, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanDukePurpleTea.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanDukePurpleTea.asset index 1f0fdf1818..b5b2e2c72e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanDukePurpleTea.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanDukePurpleTea.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanDukePurpleTea m_EditorClassIdentifier: - nameString: soda_dukepurpletea prefab: {fileID: 169984495843080388, guid: 177428b73bad0fb4a89d1a64b85629bf, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9275ab75afcd2ea40b8d00845d500d6a, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanTonic.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanTonic.asset index 1df59eaa2a..197e1f4b8b 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanTonic.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/Drinks/Soda/SodaCanTonic.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SodaCanTonic m_EditorClassIdentifier: - nameString: soda_tonic prefab: {fileID: 2434868383632068905, guid: a7c35693adae32f43b4d7fe2eb8b091b, type: 3} + PrefabAsset: {fileID: 11400000, guid: 532f39f1310fc5d41b37195bc4d0ae11, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/General/Snacks/DonkPocket.asset b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/General/Snacks/DonkPocket.asset index ca3fb0e147..d0ce5474ef 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/General/Snacks/DonkPocket.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Consumables/Food/General/Snacks/DonkPocket.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: DonkPocket m_EditorClassIdentifier: prefab: {fileID: 3969530706517246485, guid: 56b1aff2041026242bed0f064dee56bb, type: 3} + PrefabAsset: {fileID: 11400000, guid: 5ebf0777f77019c469729ac80e12720b, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Cosmetic/BikeHorn.asset b/Assets/Content/Data/TileMap/Resources/Items/Cosmetic/BikeHorn.asset index b881c03c78..162ca9ae2a 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Cosmetic/BikeHorn.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Cosmetic/BikeHorn.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: BikeHorn m_EditorClassIdentifier: - nameString: bikehorn prefab: {fileID: 6891363543938182813, guid: 11f824c472e04854e95065dda095e8f4, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3747dddbc41cad94bbbfc43bfed384c3, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Doodad.asset b/Assets/Content/Data/TileMap/Resources/Items/Doodad.asset index 6f51194f70..35699274e3 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Doodad.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Doodad.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Doodad m_EditorClassIdentifier: - nameString: Doodad prefab: {fileID: 3792017003477948967, guid: f6528d8afa18fa14998a0158260ef26c, type: 3} + PrefabAsset: {fileID: 11400000, guid: 27ff1c5556f9d4c40b179cfecee706ea, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Boombox.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Boombox.asset index e96f5f6f86..6b4f0a97c5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Boombox.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Boombox.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Boombox m_EditorClassIdentifier: prefab: {fileID: 8197868818743549203, guid: 1d2cf546d53e3fe4c9103007427aaec7, type: 3} + PrefabAsset: {fileID: 11400000, guid: d81d46f903aad014aa4728a8b47ab7ea, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/FloorTile.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/FloorTile.asset index 821c6ed789..bb10aa60a8 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/FloorTile.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/FloorTile.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: FloorTile m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 404443f7c306fc8469698745624fa3bf, type: 3} + PrefabAsset: {fileID: 11400000, guid: 943460668ce3db0429d1617490f983ef, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/IDCard.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/IDCard.asset index 721109e1f2..c8728eafea 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/IDCard.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/IDCard.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: IDCard m_EditorClassIdentifier: - nameString: idcard prefab: {fileID: 5261116577612792016, guid: d8b0c8d1ddcdeb24d9763054c103c9fe, type: 3} + PrefabAsset: {fileID: 11400000, guid: d4a76ab7d8dbea34cb528fc2b784fd70, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/PDA.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/PDA.asset index de40eeed5c..1add5ff498 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/PDA.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/PDA.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: PDA m_EditorClassIdentifier: - nameString: pda prefab: {fileID: 5261116577612792016, guid: 79260483ae5d3e04fa272e092b49abac, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4773cbe0a88c809459547e0d0eff8d29, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityIDCard.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityIDCard.asset index 2e49bfefd5..1714aeefd8 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityIDCard.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityIDCard.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SecurityIDCard m_EditorClassIdentifier: - nameString: security_idcard prefab: {fileID: 5261116577612792016, guid: ff95abc9c2b779340a1b50f1a128a934, type: 3} + PrefabAsset: {fileID: 11400000, guid: bca8d36802b3dbc47bc479151a3f7ea1, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityPDA.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityPDA.asset index 75c2c4cb5c..71151d3d92 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityPDA.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Identification/SecurityPDA.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: SecurityPDA m_EditorClassIdentifier: - nameString: security_pda prefab: {fileID: 5261116577612792016, guid: 2a63163a4db141744a802f3ff67087db, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4f09dc7f882c18542b750da80a29720f, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Poster.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Poster.asset index 89d80d95c9..45397c4a7e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Poster.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Poster.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Poster m_EditorClassIdentifier: - nameString: poster prefab: {fileID: 5161561551087789900, guid: b044d7bdb55405046a9055726a779eb1, type: 3} + PrefabAsset: {fileID: 11400000, guid: cd3268046db629240800ee48b64a9810, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/OxygenTank.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/OxygenTank.asset index a0c015fb97..0c2e2e4352 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/OxygenTank.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/OxygenTank.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: OxygenTank m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 5479411218b869144b7d09d6db6dc58e, type: 3} + PrefabAsset: {fileID: 11400000, guid: b42f227c43baa2141938339b7dda3f71, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/PlasmaTank.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/PlasmaTank.asset index 16a6c4fbaf..239a6dc390 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/PlasmaTank.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Generic/Tanks/PlasmaTank.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: PlasmaTank m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: e3fb39f0a84acf541b6ee828550a1708, type: 3} + PrefabAsset: {fileID: 11400000, guid: a34baef34dca37c449a6f5872216edfc, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalCable.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalCable.asset index 3596868ae9..c0a55c94df 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalCable.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalCable.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: ElectricalCable m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 0e69918696f58e04f846e985ec7405fe, type: 3} + PrefabAsset: {fileID: 11400000, guid: 40f2a5ef12396ce469ae6fa7474a6bc6, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalWire.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalWire.asset index f91415993f..063b5be1e5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalWire.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/ElectricalWire.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: ElectricalWire m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: cc71128d4bcc0c548ac11481000ac424, type: 3} + PrefabAsset: {fileID: 11400000, guid: 61cd16bb4793cd544836dea40a2450f8, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassReinforcedSheet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassReinforcedSheet.asset index f661730d02..e836fa9222 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassReinforcedSheet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassReinforcedSheet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: GlassReinforcedSheet m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: a1a7407e08bb2914c97f431063bf83e2, type: 3} + PrefabAsset: {fileID: 11400000, guid: 761f8c0e668a1d94ca1e59a4d7561a75, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassShard.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassShard.asset index 400061e5c3..7ab45be943 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassShard.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassShard.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: GlassShard m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 5cab1a9f6c7f74948b84d0d625319efe, type: 3} + PrefabAsset: {fileID: 11400000, guid: e8b9b8395d0c7624aa218df1abb9e29d, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassSheet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassSheet.asset index 764bd89fc6..de997580c0 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassSheet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/GlassSheet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: GlassSheet m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: e2a06f02e6a7e0348bdc535344bfe1f3, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3c8e8f4d958f81744a729dc344342955, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelReinforcedSheet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelReinforcedSheet.asset index 058d159580..9f4b78607e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelReinforcedSheet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelReinforcedSheet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: SteelReinforcedSheet m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: f88a398ad3d01454f955de9c337d9b99, type: 3} + PrefabAsset: {fileID: 11400000, guid: 05cd3679ee853174fb8651304e81f0cd, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelRod.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelRod.asset index 783e8573f9..e0324a6116 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelRod.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelRod.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: SteelRod m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 48fa93e2da7acb3499e400becf2afc26, type: 3} + PrefabAsset: {fileID: 11400000, guid: 3f647cba5228eee4c96dcb4d68c089af, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelSheet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelSheet.asset index 3be57ebb41..e4a122236d 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelSheet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/SteelSheet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: SteelSheet m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 4cb99cf2fee96f944abbacc51b0b701c, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8cfc0ba9b0715224ca017ad6ddfbd66b, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodLog.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodLog.asset index 87ed92d899..4545f65ca6 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodLog.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodLog.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: WoodLog m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 2767aeb6e6fd53b43a1cb305789834d4, type: 3} + PrefabAsset: {fileID: 11400000, guid: e6c3ae3d10a33e240832b7bc90d7b11c, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodPlank.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodPlank.asset index 09906ddab0..0540fd17a5 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodPlank.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Materials/WoodPlank.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: WoodPlank m_EditorClassIdentifier: prefab: {fileID: 7125681683583715523, guid: 4aee3fb97a6a2d442804c8c0b8347a92, type: 3} + PrefabAsset: {fileID: 11400000, guid: 76027f7163b6f874f8e6d0cb5ae45b29, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MatterBin.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MatterBin.asset index b780181835..4109512bf2 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MatterBin.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MatterBin.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: MatterBin m_EditorClassIdentifier: prefab: {fileID: 2402587210622244651, guid: ed77d98d3e75b7946b404face1fe8f82, type: 3} + PrefabAsset: {fileID: 11400000, guid: d09858427deec014fb0abe5ea0b79bdd, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MicroLaser.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MicroLaser.asset index 9e945c78e3..32efae4738 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MicroLaser.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/MachineParts/MicroLaser.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: MicroLaser m_EditorClassIdentifier: prefab: {fileID: 2402587210622244651, guid: 84cec183559b4954c883b11f20f767c9, type: 3} + PrefabAsset: {fileID: 11400000, guid: 57ac37b5fd825134a8d8d08b9d87ba70, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCell.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCell.asset index 30dceb9378..0865087e55 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCell.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCell.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: PowerCell m_EditorClassIdentifier: - nameString: PowerCell prefab: {fileID: 2402587210622244651, guid: de67200a4c96d444f800399a033ddfef, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4d84c9a7bcbaa564d8958c6875c8c02d, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCellAdmin.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCellAdmin.asset index 1403ef387b..112bacbdfe 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCellAdmin.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Parts/PowerCells/PowerCellAdmin.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: PowerCellAdmin m_EditorClassIdentifier: - nameString: PowerCellAdmin prefab: {fileID: 7927487060350510867, guid: c69ed93dc225ea049bbf1a02662c48c0, type: 3} + PrefabAsset: {fileID: 11400000, guid: 19be5347e4fe0e346b5f3a3a9b3081fa, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/Medkit.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/Medkit.asset index 31ba524b28..108e861888 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/Medkit.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/Medkit.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Medkit m_EditorClassIdentifier: prefab: {fileID: 5533951594911835035, guid: 1e64a1c37be1f7c44a5d242d6ec6da10, type: 3} + PrefabAsset: {fileID: 11400000, guid: d9cc887ee78f4f64f9c399b8aaffe9f9, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/ToolboxBlue.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/ToolboxBlue.asset index 2d1eec4ab0..0d21a2a29b 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/ToolboxBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Objects/ToolboxBlue.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: ToolboxBlue m_EditorClassIdentifier: - nameString: toolbox_blue prefab: {fileID: 5533951594911835035, guid: 264ea51d92067c14ebc6633999afac78, type: 3} + PrefabAsset: {fileID: 11400000, guid: 734468cf273e2144d945698e4793b7c5, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Substances/Mug.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Substances/Mug.asset index 32f96f5760..ac50b41ae7 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Substances/Mug.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Storage/Substances/Mug.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Mug m_EditorClassIdentifier: - nameString: mug prefab: {fileID: 5261116577612792016, guid: d9aabfd5d726a7f499b8e360d919eba4, type: 3} + PrefabAsset: {fileID: 11400000, guid: 162ccd1fc7d534046874df3d9dcf2315, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Botany/Hatchet.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Botany/Hatchet.asset index a51cbc9001..d261d3b757 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Botany/Hatchet.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Botany/Hatchet.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Hatchet m_EditorClassIdentifier: prefab: {fileID: 2402587210622244651, guid: 9e967cb4084bf064c8a0ca5f57a33b0c, type: 3} + PrefabAsset: {fileID: 11400000, guid: 2577eda4621dd6248b3c3813ef15ad76, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Command/NuclearAuthenticationDisk.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Command/NuclearAuthenticationDisk.asset index 7e2090636d..11493b58d4 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Command/NuclearAuthenticationDisk.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Command/NuclearAuthenticationDisk.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: NuclearAuthenticationDisk m_EditorClassIdentifier: - nameString: nuke_disk prefab: {fileID: 6891363543938182813, guid: 1ae18785d74e9fa4699b6f6de889c243, type: 3} + PrefabAsset: {fileID: 11400000, guid: 50284e9bdc2ff2943ba806e8d5ce8f9f, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Crowbar.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Crowbar.asset index 14e6b6276c..af78e65053 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Crowbar.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Crowbar.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Crowbar m_EditorClassIdentifier: - nameString: Crowbar prefab: {fileID: 1888703706215615217, guid: 7becfab153276864f9fc7636a839d837, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9310ba3e563558e42bdbd19ee6b8440c, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Multitool.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Multitool.asset index ab309aa0c7..9bbc727787 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Multitool.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Multitool.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Multitool m_EditorClassIdentifier: - nameString: Multitool prefab: {fileID: 2402587210622244651, guid: 2ca5f2886cf2f19428b50bf284689b86, type: 3} + PrefabAsset: {fileID: 11400000, guid: bd14f7dd0646a2240adf09ba61ce700a, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/ScrewdriverBlue.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/ScrewdriverBlue.asset index 4d33c208a4..419997fc10 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/ScrewdriverBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/ScrewdriverBlue.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: ScrewdriverBlue m_EditorClassIdentifier: - nameString: ScrewdriverBlue prefab: {fileID: 2402587210622244651, guid: 9c8363ee7f934bd4b8ee5a2e30da1269, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9e4b9aa465bc48d4faa9b53cd0132f11, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Welder.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Welder.asset index da8fa6b081..b65b3b788c 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Welder.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Welder.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: Welder m_EditorClassIdentifier: prefab: {fileID: 7393721560307922778, guid: 06d944205e6b6dd489af078fa85fb878, type: 3} + PrefabAsset: {fileID: 11400000, guid: 715777b8c0a0f1b4cb29ee4dab0326e4, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wirecutters.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wirecutters.asset index 5bbbbd7adc..3a487e2c2e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wirecutters.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wirecutters.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Wirecutters m_EditorClassIdentifier: - nameString: Wirecutters prefab: {fileID: 2402587210622244651, guid: 41a1c8c211dc32c4d8ffca5f0892f9dc, type: 3} + PrefabAsset: {fileID: 11400000, guid: f784858d359bb434c9a7ea797c27552d, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wrench.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wrench.asset index 261b152d99..b1cbc4e0dc 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wrench.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Engineering/Wrench.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: Wrench m_EditorClassIdentifier: - nameString: Wrench prefab: {fileID: 3792017003477948967, guid: 772da386eb7b01745913050fee544c32, type: 3} + PrefabAsset: {fileID: 11400000, guid: fd8e3cf550cdc704281d3b94b5c8d631, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Generic/FlashlightBlue.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Generic/FlashlightBlue.asset index 07e52ea613..2088ee3ac2 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Generic/FlashlightBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Generic/FlashlightBlue.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: FlashlightBlue m_EditorClassIdentifier: - nameString: FlashlightBlue prefab: {fileID: 833752496874958856, guid: 781dd9024aaa53444bc3deeaa9708fbb, type: 3} + PrefabAsset: {fileID: 11400000, guid: cb8a18ff6b582ec45a3aa1f689a18564, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Kitchen/KitchenKnife.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Kitchen/KitchenKnife.asset index 2964f3940f..982038cc60 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Kitchen/KitchenKnife.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Kitchen/KitchenKnife.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 827764dff5251cd4ebdef8908d68f3dd, type: 3} m_Name: KitchenKnife m_EditorClassIdentifier: - nameString: Kitchen knife prefab: {fileID: 3794527162878356835, guid: 411b513efc8f06a40aecfc47d0c5fc5a, type: 3} + PrefabAsset: {fileID: 11400000, guid: f5a2860feace1434ea982b06d2445f9f, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Medical/HealthScanner.asset b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Medical/HealthScanner.asset index 351f14cf6f..ebc92ab47e 100644 --- a/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Medical/HealthScanner.asset +++ b/Assets/Content/Data/TileMap/Resources/Items/Functional/Tools/Medical/HealthScanner.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: HealthScanner m_EditorClassIdentifier: prefab: {fileID: 3794527162878356835, guid: e9f99df80a74fd242aa46e53c7ec0376, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8b24dd8aaf23acb41b038d6e4394f749, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockCivilian.asset b/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockCivilian.asset index e0ecc44f70..60fbf96227 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockCivilian.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockCivilian.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AirlockCivilian m_EditorClassIdentifier: - nameString: airlock_civilian prefab: {fileID: 7133738675197207439, guid: 84a5596b28f449e49bb34741abf89d30, type: 3} + PrefabAsset: {fileID: 11400000, guid: a9fdd63bb75b809479346bf8a5304420, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 13 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockSecurity.asset b/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockSecurity.asset index d22fa049ef..3d59c57076 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockSecurity.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Doors/AirlockSecurity.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AirlockSecurity m_EditorClassIdentifier: - nameString: airlock_security prefab: {fileID: 7133738675197207439, guid: d25b39d1e2379b64cba47629530ada78, type: 3} + PrefabAsset: {fileID: 11400000, guid: a88eb8e09990e854d81539973299f61f, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 13 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Catwalk.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Catwalk.asset index b6d9b90337..3762914430 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Catwalk.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Catwalk.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Catwalk m_EditorClassIdentifier: - nameString: catwalk prefab: {fileID: 8178185248287418974, guid: a28267798293970468ab30803632a3f7, type: 3} + PrefabAsset: {fileID: 11400000, guid: b4f1b51f78d516547a665fcbfcc9a7c9, type: 2} icon: {fileID: 0} + _nameString: layer: 0 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Lattice.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Lattice.asset index 8c8af48dea..227458ac1d 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Lattice.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Lattice.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Lattice m_EditorClassIdentifier: - nameString: lattice prefab: {fileID: 7825286949101219487, guid: 854451834f026fb4f860bf0e977a104c, type: 3} + PrefabAsset: {fileID: 11400000, guid: b692a03693f271f42a9207742b0d900a, type: 2} icon: {fileID: 0} + _nameString: layer: 0 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Plenum.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Plenum.asset index afa0b07a24..2131363397 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Plenum.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Plenum.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Plenum m_EditorClassIdentifier: - nameString: plenum prefab: {fileID: 8028539322119499722, guid: 3b33b5cf16a677a4e85a110679cde32a, type: 3} + PrefabAsset: {fileID: 11400000, guid: b0c72ccf49a812947b0b526481ec6b7a, type: 2} icon: {fileID: 0} + _nameString: layer: 0 genericType: 8 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBlue.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBlue.asset index 065022d19d..abd611e1d2 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBlue.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBlue.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerBlue m_EditorClassIdentifier: - nameString: overlay_blue prefab: {fileID: 6767447678079105841, guid: 821d0946be816bb42a0eed24631d57ee, type: 3} + PrefabAsset: {fileID: 11400000, guid: 65c0502418577df42af3550984f4d3e4, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBrown.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBrown.asset index bdb86cef2b..6ae4144550 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBrown.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerBrown.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerBrown m_EditorClassIdentifier: - nameString: overlay_brown prefab: {fileID: 6767447678079105841, guid: 3a7b793253e1a0f4587097192998c361, type: 3} + PrefabAsset: {fileID: 11400000, guid: abb8c67566bdcf9438e555572a418bcc, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerGreen.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerGreen.asset index faa843c550..641feb400d 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerGreen.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerGreen.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerGreen m_EditorClassIdentifier: - nameString: overlay_green prefab: {fileID: 6767447678079105841, guid: b3e652487789fe54d8d24245d5962c3a, type: 3} + PrefabAsset: {fileID: 11400000, guid: d14164a0dea844d4b87267ce6b740365, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerOrange.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerOrange.asset index 942e65df22..cedda91d49 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerOrange.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerOrange.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerOrange m_EditorClassIdentifier: - nameString: overlay_orange prefab: {fileID: 6767447678079105841, guid: 6cd51fc127b8aac40b2accd3e2666202, type: 3} + PrefabAsset: {fileID: 11400000, guid: 5ca13124364b49a4e8812b39fcdf9c03, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerPurple.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerPurple.asset index 5bb7e9b802..115c993964 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerPurple.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerPurple.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerPurple m_EditorClassIdentifier: - nameString: overlay_purple prefab: {fileID: 6767447678079105841, guid: 14df766b77b0daf4b82ad93125f66782, type: 3} + PrefabAsset: {fileID: 11400000, guid: b58ca8ffc283af542b756a32df865f58, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerRed.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerRed.asset index afec2823f6..24acc083d3 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerRed.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/TileOverlays/CornerRed.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: CornerRed m_EditorClassIdentifier: - nameString: overlay_red prefab: {fileID: 6767447678079105841, guid: 5e24183c4537dcf47b16fde5ab1ce0ea, type: 3} + PrefabAsset: {fileID: 11400000, guid: 51754ff4045cce948a7d03d37ac3ed54, type: 2} icon: {fileID: 0} + _nameString: layer: 9 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TIleGrey.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TIleGrey.asset index f76ff14650..bfff875d89 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TIleGrey.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TIleGrey.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TIleGrey m_EditorClassIdentifier: - nameString: tile_grey prefab: {fileID: 6767447678079105841, guid: 7a47e5b68d8bab647b3f99ee3af524c7, type: 3} + PrefabAsset: {fileID: 11400000, guid: dbff915a0c8dd9442b22781f2358017c, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileBar.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileBar.asset index 5da322c0d6..cb7a9de8c7 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileBar.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileBar.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileBar m_EditorClassIdentifier: - nameString: tile_bar prefab: {fileID: 6767447678079105841, guid: 75680e6a1df5ff547bdb5b8f116f766b, type: 3} + PrefabAsset: {fileID: 11400000, guid: e6e23e6ec76da7c4eaf5f33cbc356f8e, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileCarpet.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileCarpet.asset index 670c436616..ba6d31d54b 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileCarpet.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileCarpet.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileCarpet m_EditorClassIdentifier: - nameString: tile_carpet - layer: 1 prefab: {fileID: 3591147544166670882, guid: 9b8a1328991fc2846bc55a3d9a82e5c0, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6f588fdc347034040af927379a043428, type: 2} icon: {fileID: 0} + _nameString: + layer: 1 genericType: 9 specificType: 5 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileDirt.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileDirt.asset index abcc9ed589..ff0170849a 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileDirt.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileDirt.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileDirt m_EditorClassIdentifier: - nameString: tile_dirt prefab: {fileID: 6767447678079105841, guid: 0ef9cea3bb74e6c4788f77e711f92d4d, type: 3} + PrefabAsset: {fileID: 11400000, guid: 41904bd2be19b8d4f9b54bcb4c35e4b1, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGrass.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGrass.asset index acb79ed405..4c3006c61e 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGrass.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGrass.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileGrass m_EditorClassIdentifier: - nameString: tile_grass prefab: {fileID: 6767447678079105841, guid: 501391c27a7f94c4d8c937f00a9ceb9f, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6b7b691c97678ca44b6e350dac1fe15f, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGreyDark.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGreyDark.asset index 033f3718b9..69cb82bf74 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGreyDark.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileGreyDark.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileGreyDark m_EditorClassIdentifier: - nameString: tile_greydark prefab: {fileID: 5554428447677395221, guid: 6873d7cf62d6ebc42966423161b799f1, type: 3} + PrefabAsset: {fileID: 11400000, guid: cf2d801ddd077fc42824b5fbfb3f4dec, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileKitchen.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileKitchen.asset index 1885a1cd75..607f2af805 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileKitchen.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileKitchen.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileKitchen m_EditorClassIdentifier: - nameString: tile_kitchen prefab: {fileID: 6767447678079105841, guid: 5ecf13819099b014eb5f731155540586, type: 3} + PrefabAsset: {fileID: 11400000, guid: 13636a93db27869488e3530c24cb465e, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TilePlating.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TilePlating.asset index ccb098c65a..2dd79e0f16 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TilePlating.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TilePlating.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TilePlating m_EditorClassIdentifier: - nameString: tile_plating prefab: {fileID: 6767447678079105841, guid: 8686fbdb413e33b4395a775c4f2ba990, type: 3} + PrefabAsset: {fileID: 11400000, guid: 663cae2ee60f36940a4e26dc0b3bf960, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileReinforced.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileReinforced.asset index a5026a849d..2c842c80d1 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileReinforced.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileReinforced.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileReinforced m_EditorClassIdentifier: - nameString: tile_reinforced prefab: {fileID: 8597721773267636030, guid: df4cf328d472de046bcbc073cbda2868, type: 3} + PrefabAsset: {fileID: 11400000, guid: 4ab72d74a57157a4fba259b6707a1234, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWhite.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWhite.asset index 9bb9e42358..b195bdd989 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWhite.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWhite.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileWhite m_EditorClassIdentifier: - nameString: tile_white prefab: {fileID: 6767447678079105841, guid: 61201f10ccc2856459a9de99d9cdc52e, type: 3} + PrefabAsset: {fileID: 11400000, guid: e5a9093f9ed950049869333d55ef39ea, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWood.asset b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWood.asset index 0ed60aadc2..dc26c81afe 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWood.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Floors/Tiles/TileWood.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: TileWood m_EditorClassIdentifier: - nameString: tile_wood prefab: {fileID: 6767447678079105841, guid: 49f2097d4710d114a89821d9164dfce2, type: 3} + PrefabAsset: {fileID: 11400000, guid: da803d5b339bf404eadd61c6f3b84474, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 9 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL1.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL1.asset index 09e2a329d7..ec161a3679 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL1.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL1.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AtmosphericsPipesL1 m_EditorClassIdentifier: - nameString: pipe_atmos1 prefab: {fileID: 2802364579275783218, guid: de6f06ad18d50134295959f438ba9c5d, type: 3} + PrefabAsset: {fileID: 11400000, guid: 34c154e54c7326c44aef8c0d179cec5b, type: 2} icon: {fileID: 0} + _nameString: layer: 11 genericType: 1 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL2.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL2.asset index 75925e4e26..2eecb38180 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL2.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL2.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AtmosphericsPipesL2 m_EditorClassIdentifier: - nameString: pipe_atmos2 prefab: {fileID: 2802364579275783218, guid: 251dc2a5fbda518429c8205c3b62165f, type: 3} + PrefabAsset: {fileID: 11400000, guid: 654481f628e6c374da829aa5f008d7dd, type: 2} icon: {fileID: 0} + _nameString: layer: 10 genericType: 1 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL3.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL3.asset index 023a91a060..56d3316b47 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL3.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL3.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AtmosphericsPipesL3 m_EditorClassIdentifier: - nameString: pipe_atmos3 prefab: {fileID: 2802364579275783218, guid: adc07a7f0fee8304691f45a201509b13, type: 3} + PrefabAsset: {fileID: 11400000, guid: 0ad56fda1bd23c84e87f2ffa176cfe45, type: 2} icon: {fileID: 0} + _nameString: layer: 12 genericType: 1 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL4.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL4.asset index 1fac33e096..e800bc0e39 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL4.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Atmospherics/AtmosphericsPipesL4.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: AtmosphericsPipesL4 m_EditorClassIdentifier: - nameString: pipe_atmos4 prefab: {fileID: 2802364579275783218, guid: 48efd00c91c310e4bb965d025c63b3ba, type: 3} + PrefabAsset: {fileID: 11400000, guid: 8bb00252a30a34b42a51ef42c87b2427, type: 2} icon: {fileID: 0} + _nameString: layer: 4 genericType: 1 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Disposals/DisposalPipes.asset b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Disposals/DisposalPipes.asset index 9cc04e3bf4..50534bfda6 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Disposals/DisposalPipes.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Pipes/Disposals/DisposalPipes.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: DisposalPipes m_EditorClassIdentifier: - nameString: pipe_disposal prefab: {fileID: 2802364579275783218, guid: 12a989ad41a83a3468d1ae9aff9628d3, type: 3} + PrefabAsset: {fileID: 11400000, guid: 57608ddf01d6f6049a7130f791e07297, type: 2} icon: {fileID: 0} + _nameString: layer: 3 genericType: 14 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/APC.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/APC.asset index 0d0740c51c..1f57fb649d 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/APC.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/APC.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: APC m_EditorClassIdentifier: prefab: {fileID: 5287103069661579500, guid: 4c966398d6624164c910cd29c1faa980, type: 3} + PrefabAsset: {fileID: 11400000, guid: cd7e56a30be55964da66a4dc51f532d1, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/AirAlarm.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/AirAlarm.asset index fe5058a940..35654fb72e 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/AirAlarm.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/AirAlarm.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: AirAlarm m_EditorClassIdentifier: prefab: {fileID: 6961426338783081091, guid: 11a2276338ebc64429dfc565b491e437, type: 3} + PrefabAsset: {fileID: 11400000, guid: 553dd4a427540f54dba418ab2a639b82, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/FireAlarm.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/FireAlarm.asset index 9051037301..65187660ca 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/FireAlarm.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/FireAlarm.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: FireAlarm m_EditorClassIdentifier: prefab: {fileID: 4866668043303595546, guid: 50dd6be959d44844ab1abf8a3f2adb01, type: 3} + PrefabAsset: {fileID: 11400000, guid: 82ff9c63ee13a144cad79942dbb6b9b6, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/LightSwitch.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/LightSwitch.asset index 5ee5ba1a2a..91adb9b21b 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/LightSwitch.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/LightSwitch.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: LightSwitch m_EditorClassIdentifier: - nameString: light_switch prefab: {fileID: 4866668043303595546, guid: d07b5fba3896ff448855d6e54356c365, type: 3} + PrefabAsset: {fileID: 11400000, guid: 2bdfc2fea79ba2643bb298047a8f3f67, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: layer: 6 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightBulbFixture.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightBulbFixture.asset index 1069be401f..ba5e620824 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightBulbFixture.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightBulbFixture.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: LightBulbFixture m_EditorClassIdentifier: - nameString: light_bulb_fixture prefab: {fileID: 4866668043303595546, guid: 98ce0a84deb394b4bbd18f31f368317c, type: 3} + PrefabAsset: {fileID: 11400000, guid: 7304ea80fca3e464bbe7a027e805ca03, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: layer: 5 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightTubeFixture.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightTubeFixture.asset index b0a7821341..5df8eaacfd 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightTubeFixture.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Lights/LightTubeFixture.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: LightTubeFixture m_EditorClassIdentifier: - nameString: light_tube_fixture prefab: {fileID: 4866668043303595546, guid: 66f6206faf2f7fb4a993d935c83fc239, type: 3} + PrefabAsset: {fileID: 11400000, guid: b4e43e35192541a4ca23c3cef6db5e4f, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: layer: 5 genericType: 0 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Mirror.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Mirror.asset index 3e5bef2a7a..054aba250b 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Mirror.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Mirror.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: Mirror m_EditorClassIdentifier: prefab: {fileID: 4866668043303595546, guid: a777a6da30f0704478e25312963a8151, type: 3} + PrefabAsset: {fileID: 11400000, guid: 1d63eb8b17aa92e48b1e167577fbfa32, type: 2} icon: {fileID: 21300000, guid: 9e89894392ee65f45bd559d4619cbade, type: 3} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterHorizontal.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterHorizontal.asset index 412a2ed4af..6c708632c8 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterHorizontal.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterHorizontal.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: PosterHorizontal m_EditorClassIdentifier: prefab: {fileID: 5161561551087789900, guid: fdaaabc96a55d824a86a3636906240c1, type: 3} + PrefabAsset: {fileID: 11400000, guid: 744c2b8be430f5a448ab30c7de840764, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterVertical.asset b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterVertical.asset index 472dda647e..69fed87b2c 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterVertical.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/WallMounts/Posters/PosterVertical.asset @@ -13,7 +13,9 @@ MonoBehaviour: m_Name: PosterVertical m_EditorClassIdentifier: prefab: {fileID: 5927714388255546572, guid: 0d6ab6288624c7348bdcbfb81d07088f, type: 3} + PrefabAsset: {fileID: 11400000, guid: ab8a961ad18f29e4da434bd050dc52c9, type: 2} icon: {fileID: 0} + _nameString: layer: 6 genericType: 0 specificType: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirder.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirder.asset index 26186894c0..8d6a4912aa 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirder.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirder.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelGirder m_EditorClassIdentifier: - nameString: girder_steel prefab: {fileID: 3591147544166670882, guid: 6c2559c2017ada740b245951a23c2e1d, type: 3} + PrefabAsset: {fileID: 11400000, guid: bbc616cb55d58144eb50ce126cfca103, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirderUnbolted.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirderUnbolted.asset index ef201c803a..6c6f809bad 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirderUnbolted.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelGirderUnbolted.asset @@ -13,4 +13,6 @@ MonoBehaviour: m_Name: SteelGirderUnbolted m_EditorClassIdentifier: prefab: {fileID: 3591147544166670882, guid: 5dba4171f2124fb48b0e32c0e10841e0, type: 3} + PrefabAsset: {fileID: 11400000, guid: 6fbb4f54f5632024680a17fba3fdf53d, type: 2} icon: {fileID: 0} + _nameString: diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWall.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWall.asset index e392f4f0c4..698cf96d69 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWall.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWall.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelWall m_EditorClassIdentifier: - nameString: wall_steel prefab: {fileID: 3591147544166670882, guid: 45d13347efae0f54882e0e56dd770bb1, type: 3} + PrefabAsset: {fileID: 11400000, guid: afd2790edc5c26a48ae1e0f45ecb1f32, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWallReinforced.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWallReinforced.asset index f9e77d959d..b2730275bd 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWallReinforced.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWallReinforced.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelWallReinforced m_EditorClassIdentifier: - nameString: wall_steelreinforced prefab: {fileID: 3591147544166670882, guid: abcc60752234e584d8d98c9dec03e7cc, type: 3} + PrefabAsset: {fileID: 11400000, guid: 9b16536c8b6953b459e5906389bc4cdd, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindow.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindow.asset index b3e8cbc55e..c6f88d0610 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindow.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindow.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelWindow m_EditorClassIdentifier: - nameString: window_steel prefab: {fileID: 3591147544166670882, guid: b9c224febb4233f4e912745553097652, type: 3} + PrefabAsset: {fileID: 11400000, guid: 72ff3e5319a440c448928af8af541920, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindowReinforced.asset b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindowReinforced.asset index 12b84b8b80..3a5cce9bd9 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindowReinforced.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Walls/SteelWindowReinforced.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: SteelWindowReinforced m_EditorClassIdentifier: - nameString: window_steelreinforced prefab: {fileID: 3591147544166670882, guid: f2493b5478dd8e946ba98861f533362e, type: 3} + PrefabAsset: {fileID: 11400000, guid: b841d8cacfb432a4789bbb387b08fe81, type: 2} icon: {fileID: 0} + _nameString: layer: 1 genericType: 3 specificType: 3 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/TileMap/Resources/Structures/Wires/Cables.asset b/Assets/Content/Data/TileMap/Resources/Structures/Wires/Cables.asset index 4e9dd0292c..5b87c683a5 100644 --- a/Assets/Content/Data/TileMap/Resources/Structures/Wires/Cables.asset +++ b/Assets/Content/Data/TileMap/Resources/Structures/Wires/Cables.asset @@ -12,11 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4584c35d672b8a74797cc5efa123ce16, type: 3} m_Name: Cables m_EditorClassIdentifier: - nameString: cables prefab: {fileID: 2802364579275783218, guid: 92d3eb280886ba74cb1e19f4e01669a7, type: 3} + PrefabAsset: {fileID: 11400000, guid: 426c07dc64523524f86c9d22e9a98936, type: 2} icon: {fileID: 0} + _nameString: layer: 2 genericType: 11 specificType: 0 width: 1 height: 1 + isLarge: 0 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/APC.asset b/Assets/Content/Data/WorldObjectAssetReferences/APC.asset new file mode 100644 index 0000000000..b4255df607 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/APC.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: APC + m_EditorClassIdentifier: + Id: 4c966398d6624164c910cd29c1faa980 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta new file mode 100644 index 0000000000..c01a5abc29 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd7e56a30be55964da66a4dc51f532d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset b/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset new file mode 100644 index 0000000000..540fd4265b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AirAlarm + m_EditorClassIdentifier: + Id: 11a2276338ebc64429dfc565b491e437 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta new file mode 100644 index 0000000000..0567b65166 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 553dd4a427540f54dba418ab2a639b82 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset new file mode 100644 index 0000000000..0446bf9fe6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AtmosPipesL1 + m_EditorClassIdentifier: + Id: de6f06ad18d50134295959f438ba9c5d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta new file mode 100644 index 0000000000..0709e3c3d6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34c154e54c7326c44aef8c0d179cec5b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset new file mode 100644 index 0000000000..ea883079df --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AtmosPipesL2 + m_EditorClassIdentifier: + Id: 251dc2a5fbda518429c8205c3b62165f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta new file mode 100644 index 0000000000..80b41c9514 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 654481f628e6c374da829aa5f008d7dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset new file mode 100644 index 0000000000..2f917332e9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AtmosPipesL3 + m_EditorClassIdentifier: + Id: adc07a7f0fee8304691f45a201509b13 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta new file mode 100644 index 0000000000..76ed130e10 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ad56fda1bd23c84e87f2ffa176cfe45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset new file mode 100644 index 0000000000..2784ca0b20 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: AtmosPipesL4 + m_EditorClassIdentifier: + Id: 48efd00c91c310e4bb965d025c63b3ba + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta new file mode 100644 index 0000000000..c16b55ca3d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8bb00252a30a34b42a51ef42c87b2427 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset b/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset new file mode 100644 index 0000000000..4cce5492d7 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Blender + m_EditorClassIdentifier: + Id: 5a09b3e93f0022b468da150e3c4a78c6 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta new file mode 100644 index 0000000000..b742054c8e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c106e3753ddf7bf478a44b1b84e29a75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset b/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset new file mode 100644 index 0000000000..b41b120cce --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Cables + m_EditorClassIdentifier: + Id: 92d3eb280886ba74cb1e19f4e01669a7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta new file mode 100644 index 0000000000..2fcd165aae --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 426c07dc64523524f86c9d22e9a98936 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset b/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset new file mode 100644 index 0000000000..f92828da76 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Catwalk + m_EditorClassIdentifier: + Id: a28267798293970468ab30803632a3f7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta new file mode 100644 index 0000000000..873fbda297 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4f1b51f78d516547a665fcbfcc9a7c9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset b/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset new file mode 100644 index 0000000000..1c168c8e0e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: ChemicalDispenser + m_EditorClassIdentifier: + Id: 829e74fee2b909242821055cc2b096e0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta new file mode 100644 index 0000000000..43bf8bb684 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1f5ecddf221c1a47982808266f2070c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset b/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset new file mode 100644 index 0000000000..9d1abc9790 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: CivillianAirlock + m_EditorClassIdentifier: + Id: 84a5596b28f449e49bb34741abf89d30 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta new file mode 100644 index 0000000000..956b633f4f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9fdd63bb75b809479346bf8a5304420 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset b/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset new file mode 100644 index 0000000000..e3487a6d88 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Cryotube + m_EditorClassIdentifier: + Id: 081d9ee3e54295d49a4970a88f4943a9 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta new file mode 100644 index 0000000000..4a9155179b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47922ffa76b90df46b58005fe77de084 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset b/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset new file mode 100644 index 0000000000..02f0dbcefd --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: DinnerBooth + m_EditorClassIdentifier: + Id: 85fa4c9b76b4b23458dcf24a745a1dfe + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta new file mode 100644 index 0000000000..6f88687a93 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4467e57350dc14745b7ef76c60fd8001 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset b/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset new file mode 100644 index 0000000000..1fc91d59c9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: DisposalBin + m_EditorClassIdentifier: + Id: 23a169aefca62c4418b6efec13df595e + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta new file mode 100644 index 0000000000..38ac94dd5d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e13680fe42def4449c8d79dc3318818 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset b/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset new file mode 100644 index 0000000000..d4b38bf4cd --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: DisposalOutlet + m_EditorClassIdentifier: + Id: 7c6bebf2e12702d48abd76acad4d1272 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta new file mode 100644 index 0000000000..a6d3c3b596 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6fa242ef9bd905b4b8ba6b969a50c17e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset b/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset new file mode 100644 index 0000000000..f5ec61baeb --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: DisposalPipes + m_EditorClassIdentifier: + Id: 12a989ad41a83a3468d1ae9aff9628d3 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta new file mode 100644 index 0000000000..36e1dc025a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57608ddf01d6f6049a7130f791e07297 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset b/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset new file mode 100644 index 0000000000..a8f298bfe9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: FancyCarpetRed + m_EditorClassIdentifier: + Id: 9b8a1328991fc2846bc55a3d9a82e5c0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta new file mode 100644 index 0000000000..e13e7dd26f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f588fdc347034040af927379a043428 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset b/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset new file mode 100644 index 0000000000..6f5f73851a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: FireAlarm + m_EditorClassIdentifier: + Id: 50dd6be959d44844ab1abf8a3f2adb01 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta new file mode 100644 index 0000000000..4426831a47 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82ff9c63ee13a144cad79942dbb6b9b6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset b/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset new file mode 100644 index 0000000000..ce0134094b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: FuelTank + m_EditorClassIdentifier: + Id: 852d57bdb0508494fb6047f36e813c69 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta new file mode 100644 index 0000000000..1a57713121 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96ca9ccd597fc434d8b4c00f1143ebee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset b/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset new file mode 100644 index 0000000000..09fbaeacf1 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Gibber + m_EditorClassIdentifier: + Id: ad055c3d74a711a4b9d9b31217883a03 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta new file mode 100644 index 0000000000..c00439e223 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b207b8ee084b79b4596fdecc5de5c8dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset b/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset new file mode 100644 index 0000000000..50190ed2d9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: JukeboxBlueGreen + m_EditorClassIdentifier: + Id: 8dc5399c58290d54f9a6cc2f6c1c9d9f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta new file mode 100644 index 0000000000..6ee3627605 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7b11732c4258a14a99087cbbc175eab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset b/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset new file mode 100644 index 0000000000..61dc568ef2 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Lattice + m_EditorClassIdentifier: + Id: 854451834f026fb4f860bf0e977a104c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta new file mode 100644 index 0000000000..146dd7ad7f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b692a03693f271f42a9207742b0d900a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset b/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset new file mode 100644 index 0000000000..0483b8fa12 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: LightBulbFixture + m_EditorClassIdentifier: + Id: 98ce0a84deb394b4bbd18f31f368317c + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta new file mode 100644 index 0000000000..c52ef73d8e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7304ea80fca3e464bbe7a027e805ca03 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset b/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset new file mode 100644 index 0000000000..6fdc9dff73 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: LightSwitch + m_EditorClassIdentifier: + Id: d07b5fba3896ff448855d6e54356c365 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta new file mode 100644 index 0000000000..753e60588e --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bdfc2fea79ba2643bb298047a8f3f67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset b/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset new file mode 100644 index 0000000000..b297cfd0f6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: LightTubeFixture + m_EditorClassIdentifier: + Id: 66f6206faf2f7fb4a993d935c83fc239 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta new file mode 100644 index 0000000000..d4f3433a02 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4e43e35192541a4ca23c3cef6db5e4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset b/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset new file mode 100644 index 0000000000..78bff4e167 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Locker + m_EditorClassIdentifier: + Id: fa1909e0d40b4cf408ff599df7a2043f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta new file mode 100644 index 0000000000..c61f0a9819 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f994423a5d0fd1e41858be3166101149 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset b/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset new file mode 100644 index 0000000000..227cb7b68d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: LockerSecure + m_EditorClassIdentifier: + Id: 330d85a67a5891145bd8037dde90f37b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta new file mode 100644 index 0000000000..075effbdeb --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3804d158eb924df468d8ebd0c01da9bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset b/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset new file mode 100644 index 0000000000..eb498d63cf --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: MachineFrame + m_EditorClassIdentifier: + Id: bdeac5e9a27546348a584caa74f00ec7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta new file mode 100644 index 0000000000..bf6f7b1d78 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7965545d91b399842b227ff775f06b33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset b/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset new file mode 100644 index 0000000000..c5ec722f35 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Microwave + m_EditorClassIdentifier: + Id: 11d64ed349b96ec4780c4dda0ad89daf + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta new file mode 100644 index 0000000000..4157c88d1f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6dc7a600d222dc644ae89ef4a09f9b8d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset b/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset new file mode 100644 index 0000000000..52c8aa8f72 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Mirror + m_EditorClassIdentifier: + Id: a777a6da30f0704478e25312963a8151 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta new file mode 100644 index 0000000000..7b095b8b1b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1d63eb8b17aa92e48b1e167577fbfa32 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset b/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset new file mode 100644 index 0000000000..34a4c860ab --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: NukeCart + m_EditorClassIdentifier: + Id: add4d1bc2d874d94782d6b8c912af5e2 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta new file mode 100644 index 0000000000..35d951a7e3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 429460ce2249f9f438cf31c6ef35b298 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset new file mode 100644 index 0000000000..6984b4bb74 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: OfficeChair + m_EditorClassIdentifier: + Id: 7a895b269e3f67241af148d25331f5af + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta new file mode 100644 index 0000000000..7d58dea1a9 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9b535e0cb6122741bab6b987207a626 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset new file mode 100644 index 0000000000..b48838ef6a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: OfficeChairBlue + m_EditorClassIdentifier: + Id: 51049866c35db47418dfe5e78bee76e7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta new file mode 100644 index 0000000000..43bf38a8ac --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb3ca8be4114e4d409b3d69fae2f9428 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset new file mode 100644 index 0000000000..aa5169ab9f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: OfficeChairGrey + m_EditorClassIdentifier: + Id: 7e7706a54d61daa47857aadd94b37002 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta new file mode 100644 index 0000000000..acbc47505d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1ce84881d67528419ccb2f2947dc17c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset b/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset new file mode 100644 index 0000000000..8706cd4b1c --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PacManGenerator + m_EditorClassIdentifier: + Id: 45cc43b84ee58e644b9523cb27682b39 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta new file mode 100644 index 0000000000..3116e91805 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70c5d3dd9aae4924ca510544b02d153f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset b/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset new file mode 100644 index 0000000000..f432f78932 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Plant0 + m_EditorClassIdentifier: + Id: 41d7af24659a0d3439668aeb4c46d9bc + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta new file mode 100644 index 0000000000..a997b9d715 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f81f6e487d7acc449f47ee1bb0c8cb7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset b/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset new file mode 100644 index 0000000000..faa98738d8 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Plant7 + m_EditorClassIdentifier: + Id: 8ae2f499d25bfcd41bf26b735c852ab1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta new file mode 100644 index 0000000000..3465f46a8c --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f69d24f5d22e8a4ebc1e60eb6c74d98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset new file mode 100644 index 0000000000..aa56766f2f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PlasticChair + m_EditorClassIdentifier: + Id: 4a1bd08646e8e1f4a861960d9b7485f8 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta new file mode 100644 index 0000000000..8d228dab71 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f62fbce52ff26fc449c2c38c1c759004 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset new file mode 100644 index 0000000000..247756297f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PlasticChairBlue + m_EditorClassIdentifier: + Id: ad124dd2ec7d83344a20a44fad208ca0 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta new file mode 100644 index 0000000000..3faffa5ef5 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c0f778498a9baa4ebc43a943c97a314 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset new file mode 100644 index 0000000000..273ecc60b3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PlasticChairGrey + m_EditorClassIdentifier: + Id: 3a25eb0bd251b5847af05fb59feff383 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta new file mode 100644 index 0000000000..df3d81ea93 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c830ff804dedfcb48aded18665c08225 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset b/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset new file mode 100644 index 0000000000..6bdd6ef20f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PosterHorizontal + m_EditorClassIdentifier: + Id: fdaaabc96a55d824a86a3636906240c1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta new file mode 100644 index 0000000000..1cd9240151 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 744c2b8be430f5a448ab30c7de840764 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset b/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset new file mode 100644 index 0000000000..8dd0887561 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PosterVertical + m_EditorClassIdentifier: + Id: 0d6ab6288624c7348bdcbfb81d07088f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta new file mode 100644 index 0000000000..b7e228c3b7 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab8a961ad18f29e4da434bd050dc52c9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset new file mode 100644 index 0000000000..4b726f8427 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: PowerCellCharger + m_EditorClassIdentifier: + Id: d32855055305ce5489c69379e2219a7d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta new file mode 100644 index 0000000000..6bde18c873 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 927209024a2e722458a308e2433956cb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset b/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset new file mode 100644 index 0000000000..448d98e21a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SMES + m_EditorClassIdentifier: + Id: b38ae683afaacc4419ac13936cecd1a5 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta new file mode 100644 index 0000000000..5cb14af93f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b02816e423698b4590effe2b46616a4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset b/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset new file mode 100644 index 0000000000..f9c5153c17 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Scrubber + m_EditorClassIdentifier: + Id: be5174cd6c3daf64a9739aff0f747a91 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta new file mode 100644 index 0000000000..a6f856f198 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b10b6c6238a5a814ba6737bfa63bc4c3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset b/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset new file mode 100644 index 0000000000..c2d3c5cd3f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SecurityAirlock + m_EditorClassIdentifier: + Id: d25b39d1e2379b64cba47629530ada78 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta new file mode 100644 index 0000000000..53846ba6ab --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a88eb8e09990e854d81539973299f61f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset b/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset new file mode 100644 index 0000000000..e7eb681964 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SecurityLocker + m_EditorClassIdentifier: + Id: dd3ce5340ed4aba4babae7020f737084 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta new file mode 100644 index 0000000000..397ef1cfe7 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 534d22d36c7a7df49adb294f3e2118a5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset b/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset new file mode 100644 index 0000000000..8ff557364a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Sink + m_EditorClassIdentifier: + Id: 1e0936c2ffa28eb419deda61c5c1cb8a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta new file mode 100644 index 0000000000..ca98a3afa6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0b8c9665d651934382cdad26ffa8081 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset b/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset new file mode 100644 index 0000000000..347144ef3d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SleeperBed + m_EditorClassIdentifier: + Id: d27600b4734eb3a4284be037a2f9d02b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta new file mode 100644 index 0000000000..d2f8410214 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba51a5776f8c1d942925425a344831a5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset b/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset new file mode 100644 index 0000000000..8f0b718cbd --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SlotMachine + m_EditorClassIdentifier: + Id: 9f028e95d4196b141acf363c01d24806 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta new file mode 100644 index 0000000000..5d6bc46c3b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad014a0995d51f64992e3022889cf64d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset b/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset new file mode 100644 index 0000000000..adb8ae083a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SolarPanel + m_EditorClassIdentifier: + Id: f0eca2b8867709749bc10f61917c4bdf + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta new file mode 100644 index 0000000000..b8d73f31e8 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38fc09810330bbd4bba345e3f9592199 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset b/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset new file mode 100644 index 0000000000..4561ac4b00 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: SolarTrackingBeacon + m_EditorClassIdentifier: + Id: 50405f05821f58c49a8badc89506b019 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta new file mode 100644 index 0000000000..d1b4cadbbf --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b27d3b93e8709f840a9f1aab59a9cc75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset new file mode 100644 index 0000000000..a98f8d7945 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableBoozeDispenser + m_EditorClassIdentifier: + Id: 7b74e45100446b440b4b0a12cd6d05ef + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta new file mode 100644 index 0000000000..820d2f6247 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a73deecf4da493441be493a67fe479ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset new file mode 100644 index 0000000000..b19750c91a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableFrameSteel + m_EditorClassIdentifier: + Id: e9009aff81f29eb429148fd71961539f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta new file mode 100644 index 0000000000..72d0645f24 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4e3ed17ef66be443b04296dab2a7ae5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset new file mode 100644 index 0000000000..708a4b8be3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableFrameWood + m_EditorClassIdentifier: + Id: 672b544ba53de0144aab307a16b085cb + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta new file mode 100644 index 0000000000..4ebd9acc56 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7a0afa03215be246be78ab71e2e2571 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset new file mode 100644 index 0000000000..c725d764d6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableGlass + m_EditorClassIdentifier: + Id: 4d48472d06930bd42a15897e6a1794ac + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta new file mode 100644 index 0000000000..08be31a74c --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57eec9e75508e354f8d240e6c7dfc96a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset b/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset new file mode 100644 index 0000000000..13afef4d49 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TablePoker + m_EditorClassIdentifier: + Id: ebddb1721dcbe36499e4d093e5a7ff09 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta new file mode 100644 index 0000000000..c0c4139a12 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ba25a1b639ddcd489a491e3bbc3eb03 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset new file mode 100644 index 0000000000..13b2c30c95 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableSteel + m_EditorClassIdentifier: + Id: 6caa99f8281726e40a793826d5c047db + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta new file mode 100644 index 0000000000..267df96dbe --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3930eec4b86e7746a89c6c716e27798 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset b/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset new file mode 100644 index 0000000000..f2ee3d08b6 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TableWood + m_EditorClassIdentifier: + Id: 5e8a02c5ce0073644ac01bdb55d72a70 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta new file mode 100644 index 0000000000..60cf293c08 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00bc0b62e52334e43b318cac04a821cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset new file mode 100644 index 0000000000..734a29ec36 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileBar + m_EditorClassIdentifier: + Id: 75680e6a1df5ff547bdb5b8f116f766b + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta new file mode 100644 index 0000000000..2d523e1609 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6e23e6ec76da7c4eaf5f33cbc356f8e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset new file mode 100644 index 0000000000..e52ceb5146 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileDirt1 + m_EditorClassIdentifier: + Id: 0ef9cea3bb74e6c4788f77e711f92d4d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta new file mode 100644 index 0000000000..2e046d1a65 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 41904bd2be19b8d4f9b54bcb4c35e4b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset new file mode 100644 index 0000000000..cc2d07b460 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileGrass + m_EditorClassIdentifier: + Id: 501391c27a7f94c4d8c937f00a9ceb9f + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta new file mode 100644 index 0000000000..ebdd4dd79d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b7b691c97678ca44b6e350dac1fe15f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset new file mode 100644 index 0000000000..28d7a021ca --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileGrey + m_EditorClassIdentifier: + Id: 7a47e5b68d8bab647b3f99ee3af524c7 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta new file mode 100644 index 0000000000..f84d79c441 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbff915a0c8dd9442b22781f2358017c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset new file mode 100644 index 0000000000..bb7a9ca23c --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileGreyDark + m_EditorClassIdentifier: + Id: 6873d7cf62d6ebc42966423161b799f1 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta new file mode 100644 index 0000000000..f3fe3497f7 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf2d801ddd077fc42824b5fbfb3f4dec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset new file mode 100644 index 0000000000..97bd247594 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileKitchen + m_EditorClassIdentifier: + Id: 5ecf13819099b014eb5f731155540586 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta new file mode 100644 index 0000000000..b5cdb0afa1 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13636a93db27869488e3530c24cb465e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset new file mode 100644 index 0000000000..530adb440f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayBlue + m_EditorClassIdentifier: + Id: 821d0946be816bb42a0eed24631d57ee + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta new file mode 100644 index 0000000000..0f84246c94 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65c0502418577df42af3550984f4d3e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset new file mode 100644 index 0000000000..1f329412bb --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayBrown + m_EditorClassIdentifier: + Id: 3a7b793253e1a0f4587097192998c361 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta new file mode 100644 index 0000000000..81d6597365 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abb8c67566bdcf9438e555572a418bcc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset new file mode 100644 index 0000000000..9ca9ccfdff --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayGreen + m_EditorClassIdentifier: + Id: b3e652487789fe54d8d24245d5962c3a + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta new file mode 100644 index 0000000000..7cb93622ba --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d14164a0dea844d4b87267ce6b740365 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset new file mode 100644 index 0000000000..42cb8db757 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayOrange + m_EditorClassIdentifier: + Id: 6cd51fc127b8aac40b2accd3e2666202 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta new file mode 100644 index 0000000000..3f36a4432d --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ca13124364b49a4e8812b39fcdf9c03 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset new file mode 100644 index 0000000000..b446a41eb3 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayPurple + m_EditorClassIdentifier: + Id: 14df766b77b0daf4b82ad93125f66782 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta new file mode 100644 index 0000000000..c05db81629 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b58ca8ffc283af542b756a32df865f58 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset new file mode 100644 index 0000000000..c20084afcc --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileOverlayRed + m_EditorClassIdentifier: + Id: 5e24183c4537dcf47b16fde5ab1ce0ea + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta new file mode 100644 index 0000000000..3f57846f6f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51754ff4045cce948a7d03d37ac3ed54 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset b/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset new file mode 100644 index 0000000000..903eb2337a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TilePlating + m_EditorClassIdentifier: + Id: 8686fbdb413e33b4395a775c4f2ba990 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta new file mode 100644 index 0000000000..a07867e215 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 663cae2ee60f36940a4e26dc0b3bf960 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset new file mode 100644 index 0000000000..11f25f79bc --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileReinforced + m_EditorClassIdentifier: + Id: df4cf328d472de046bcbc073cbda2868 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta new file mode 100644 index 0000000000..4afbfc9f77 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ab72d74a57157a4fba259b6707a1234 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset new file mode 100644 index 0000000000..307936c91a --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileWhite + m_EditorClassIdentifier: + Id: 61201f10ccc2856459a9de99d9cdc52e + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta new file mode 100644 index 0000000000..19fe894f08 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5a9093f9ed950049869333d55ef39ea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset b/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset new file mode 100644 index 0000000000..ee9605f0ae --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: TileWood + m_EditorClassIdentifier: + Id: 49f2097d4710d114a89821d9164dfce2 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta new file mode 100644 index 0000000000..b22971e09f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da803d5b339bf404eadd61c6f3b84474 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset b/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset new file mode 100644 index 0000000000..177af935da --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: VendorHotDrinks + m_EditorClassIdentifier: + Id: b7976a98a25be4543ba45f1d5e26c072 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta new file mode 100644 index 0000000000..09e21c113f --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 147f3795b10839d4cbcc1d34086d1b1f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset b/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset new file mode 100644 index 0000000000..f4e23e6e5b --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: VendorRobustSoftdrinks + m_EditorClassIdentifier: + Id: 93faf7e7a5c67b9478c57a0d03340256 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta new file mode 100644 index 0000000000..2ce29d8738 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bef70bf5ad92da45afa079fa69185b5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset b/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset new file mode 100644 index 0000000000..e552988296 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: VendorSecTech + m_EditorClassIdentifier: + Id: 6f2976f635940684da7f7f4ed7855a8d + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta new file mode 100644 index 0000000000..a867713321 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32c17bc4bdd2e8a43a4957440b5a1822 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset b/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset new file mode 100644 index 0000000000..4b6d9a8258 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: VendorYouTool + m_EditorClassIdentifier: + Id: cc1b7e8558e50594089a64af537ff781 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta new file mode 100644 index 0000000000..ddeb45dc15 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4e9603aa7cef9341be50d058b95d0d5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset b/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset new file mode 100644 index 0000000000..df83042b34 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: Vent + m_EditorClassIdentifier: + Id: bb2ccbe283c7a7d459f283a7483e04b9 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta new file mode 100644 index 0000000000..3d081ce4de --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c05dfac29f4de184e8dcb9be586d1d72 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset b/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset new file mode 100644 index 0000000000..a197c46509 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: WaterCooler + m_EditorClassIdentifier: + Id: 0188e95eec8518246940499957802de9 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta new file mode 100644 index 0000000000..40b5c4ccc4 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e00ebdb1aa55d3a40ab6a8c03d1d0529 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset b/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset new file mode 100644 index 0000000000..cc2c8523e2 --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ba336da0014235becfe02dce35b6ca, type: 3} + m_Name: WaterTank + m_EditorClassIdentifier: + Id: d675e0c37e3147a4b8501314b5106f13 + Database: c2644d7b34e956743a0bc485e7ca5e37 diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta b/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta new file mode 100644 index 0000000000..063b5078fb --- /dev/null +++ b/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b3e7d5b83122c048bf3679e7e38edd2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SS3D/Data/Generated/Items.cs b/Assets/Scripts/SS3D/Data/Generated/Items.cs index 079dc3d5d4..048b8746b8 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Items.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Items.cs @@ -3,19 +3,39 @@ namespace SS3D.Data.Generated // This class is autogenerated. Do not modify manually. public static class Items { + public const string AirAlarm = "11a2276338ebc64429dfc565b491e437"; + public const string APC = "4c966398d6624164c910cd29c1faa980"; + public const string AtmosPipesL1 = "de6f06ad18d50134295959f438ba9c5d"; + public const string AtmosPipesL2 = "251dc2a5fbda518429c8205c3b62165f"; + public const string AtmosPipesL3 = "adc07a7f0fee8304691f45a201509b13"; + public const string AtmosPipesL4 = "48efd00c91c310e4bb965d025c63b3ba"; public const string Backpack = "ddaa28fac1956b2428aff1dac1d89707"; public const string BikeHorn = "11f824c472e04854e95065dda095e8f4"; + public const string Blender = "5a09b3e93f0022b468da150e3c4a78c6"; public const string Boombox = "1d2cf546d53e3fe4c9103007427aaec7"; public const string BrutePatch = "b5be0a52925e2674193d081d2deb68cb"; public const string BurnPatch = "162e188d33a82b440a239f20901c716a"; + public const string Cables = "92d3eb280886ba74cb1e19f4e01669a7"; + public const string Catwalk = "a28267798293970468ab30803632a3f7"; + public const string ChemicalDispenser = "829e74fee2b909242821055cc2b096e0"; + public const string CivillianAirlock = "84a5596b28f449e49bb34741abf89d30"; public const string Crowbar = "7becfab153276864f9fc7636a839d837"; + public const string Cryotube = "081d9ee3e54295d49a4970a88f4943a9"; + public const string DinnerBooth = "85fa4c9b76b4b23458dcf24a745a1dfe"; + public const string DisposalBin = "23a169aefca62c4418b6efec13df595e"; + public const string DisposalOutlet = "7c6bebf2e12702d48abd76acad4d1272"; + public const string DisposalPipes = "12a989ad41a83a3468d1ae9aff9628d3"; public const string DonkPocket = "56b1aff2041026242bed0f064dee56bb"; public const string Doodad = "f6528d8afa18fa14998a0158260ef26c"; public const string ElectricalCable = "0e69918696f58e04f846e985ec7405fe"; public const string ElectricalWire = "cc71128d4bcc0c548ac11481000ac424"; public const string FacewearGasMask = "bf177f8bab26bc84b87fd9a971004418"; + public const string FancyCarpetRed = "9b8a1328991fc2846bc55a3d9a82e5c0"; + public const string FireAlarm = "50dd6be959d44844ab1abf8a3f2adb01"; public const string FlashlightBlue = "781dd9024aaa53444bc3deeaa9708fbb"; public const string FloorTile = "404443f7c306fc8469698745624fa3bf"; + public const string FuelTank = "852d57bdb0508494fb6047f36e813c69"; + public const string Gibber = "ad055c3d74a711a4b9d9b31217883a03"; public const string GlassReinforcedSheet = "a1a7407e08bb2914c97f431063bf83e2"; public const string GlassShard = "5cab1a9f6c7f74948b84d0d625319efe"; public const string GlassSheet = "e2a06f02e6a7e0348bdc535344bfe1f3"; @@ -46,30 +66,60 @@ public static class Items public const string HumanStomach = "2bc6f6a968d5ba04c919ba56d0ccdab4"; public const string HumanTorso = "4a9d34a6cf84ef045a740513d8ae30b1"; public const string IDCard = "d8b0c8d1ddcdeb24d9763054c103c9fe"; + public const string JukeboxBlueGreen = "8dc5399c58290d54f9a6cc2f6c1c9d9f"; public const string JumpsuitBotany = "be3fcf1a74268ad49bfedb1edd9f5318"; public const string JumpsuitEngineer = "7436f4976849b994aaee40df1bca7d89"; public const string JumpsuitGrey = "236b51ddc6f9aa94ca92579082370c06"; public const string JumpsuitSecurity = "93ad90421a3b2f64e8fdb9e95a42ba90"; public const string KitchenKnife = "411b513efc8f06a40aecfc47d0c5fc5a"; + public const string Lattice = "854451834f026fb4f860bf0e977a104c"; + public const string LightBulbFixture = "98ce0a84deb394b4bbd18f31f368317c"; + public const string LightSwitch = "d07b5fba3896ff448855d6e54356c365"; + public const string LightTubeFixture = "66f6206faf2f7fb4a993d935c83fc239"; + public const string Locker = "fa1909e0d40b4cf408ff599df7a2043f"; + public const string LockerSecure = "330d85a67a5891145bd8037dde90f37b"; + public const string MachineFrame = "bdeac5e9a27546348a584caa74f00ec7"; public const string MatterBin = "ed77d98d3e75b7946b404face1fe8f82"; public const string MedicalPatch = "2332a158259900e4f8a237fa8daff266"; public const string Medkit = "1e64a1c37be1f7c44a5d242d6ec6da10"; public const string MicroLaser = "84cec183559b4954c883b11f20f767c9"; + public const string Microwave = "11d64ed349b96ec4780c4dda0ad89daf"; + public const string Mirror = "a777a6da30f0704478e25312963a8151"; public const string Mug = "d9aabfd5d726a7f499b8e360d919eba4"; public const string Multitool = "2ca5f2886cf2f19428b50bf284689b86"; public const string NuclearAuthenticationDisk = "1ae18785d74e9fa4699b6f6de889c243"; + public const string NukeCart = "add4d1bc2d874d94782d6b8c912af5e2"; + public const string OfficeChair = "7a895b269e3f67241af148d25331f5af"; + public const string OfficeChairBlue = "51049866c35db47418dfe5e78bee76e7"; + public const string OfficeChairGrey = "7e7706a54d61daa47857aadd94b37002"; public const string OxygenTank = "5479411218b869144b7d09d6db6dc58e"; + public const string PacManGenerator = "45cc43b84ee58e644b9523cb27682b39"; public const string PDA = "79260483ae5d3e04fa272e092b49abac"; + public const string Plant0 = "41d7af24659a0d3439668aeb4c46d9bc"; + public const string Plant7 = "8ae2f499d25bfcd41bf26b735c852ab1"; public const string PlasmaTank = "e3fb39f0a84acf541b6ee828550a1708"; + public const string PlasticChair = "4a1bd08646e8e1f4a861960d9b7485f8"; + public const string PlasticChairBlue = "ad124dd2ec7d83344a20a44fad208ca0"; + public const string PlasticChairGrey = "3a25eb0bd251b5847af05fb59feff383"; public const string Plenum = "3b33b5cf16a677a4e85a110679cde32a"; public const string Poster = "b044d7bdb55405046a9055726a779eb1"; + public const string PosterHorizontal = "fdaaabc96a55d824a86a3636906240c1"; + public const string PosterVertical = "0d6ab6288624c7348bdcbfb81d07088f"; public const string PowerCell = "de67200a4c96d444f800399a033ddfef"; public const string PowerCellAdmin = "c69ed93dc225ea049bbf1a02662c48c0"; + public const string PowerCellCharger = "d32855055305ce5489c69379e2219a7d"; public const string ScrewdriverBlue = "9c8363ee7f934bd4b8ee5a2e30da1269"; + public const string Scrubber = "be5174cd6c3daf64a9739aff0f747a91"; + public const string SecurityAirlock = "d25b39d1e2379b64cba47629530ada78"; public const string SecurityIDCard = "ff95abc9c2b779340a1b50f1a128a934"; + public const string SecurityLocker = "dd3ce5340ed4aba4babae7020f737084"; public const string SecurityPDA = "2a63163a4db141744a802f3ff67087db"; public const string ShoeHiTops = "81faf4debf00a0a478b924176f48d011"; public const string ShoeJackboots = "535ed7c02b5cbdc43ae2b234a963c5cc"; + public const string Sink = "1e0936c2ffa28eb419deda61c5c1cb8a"; + public const string SleeperBed = "d27600b4734eb3a4284be037a2f9d02b"; + public const string SlotMachine = "9f028e95d4196b141acf363c01d24806"; + public const string SMES = "b38ae683afaacc4419ac13936cecd1a5"; public const string SodaCanBeepsSoda = "f490a74616c067c4f83995017e10b420"; public const string SodaCanBeepyLime = "4e6899916bc8fd742a07f32b3a04de12"; public const string SodaCanCannedAir = "e4281cb43d1443d4388737777fdd98d8"; @@ -77,6 +127,8 @@ public static class Items public const string SodaCanCola = "92d6696a323ef66448190e8e9d69fd22"; public const string SodaCanDukePurpleTea = "177428b73bad0fb4a89d1a64b85629bf"; public const string SodaCanTonic = "a7c35693adae32f43b4d7fe2eb8b091b"; + public const string SolarPanel = "f0eca2b8867709749bc10f61917c4bdf"; + public const string SolarTrackingBeacon = "50405f05821f58c49a8badc89506b019"; public const string SteelGirder = "6c2559c2017ada740b245951a23c2e1d"; public const string SteelGirderUnbolted = "5dba4171f2124fb48b0e32c0e10841e0"; public const string SteelReinforcedSheet = "f88a398ad3d01454f955de9c337d9b99"; @@ -87,9 +139,39 @@ public static class Items public const string SteelWindow = "b9c224febb4233f4e912745553097652"; public const string SteelWindowReinforced = "f2493b5478dd8e946ba98861f533362e"; public const string Sunglasses = "9b9f6bd470226a74b903e74dbe9e423a"; + public const string TableBoozeDispenser = "7b74e45100446b440b4b0a12cd6d05ef"; + public const string TableFrameSteel = "e9009aff81f29eb429148fd71961539f"; + public const string TableFrameWood = "672b544ba53de0144aab307a16b085cb"; + public const string TableGlass = "4d48472d06930bd42a15897e6a1794ac"; + public const string TablePoker = "ebddb1721dcbe36499e4d093e5a7ff09"; + public const string TableSteel = "6caa99f8281726e40a793826d5c047db"; + public const string TableWood = "5e8a02c5ce0073644ac01bdb55d72a70"; + public const string TileBar = "75680e6a1df5ff547bdb5b8f116f766b"; + public const string TileDirt1 = "0ef9cea3bb74e6c4788f77e711f92d4d"; + public const string TileGrass = "501391c27a7f94c4d8c937f00a9ceb9f"; + public const string TileGrey = "7a47e5b68d8bab647b3f99ee3af524c7"; + public const string TileGreyDark = "6873d7cf62d6ebc42966423161b799f1"; + public const string TileKitchen = "5ecf13819099b014eb5f731155540586"; + public const string TileOverlayBlue = "821d0946be816bb42a0eed24631d57ee"; + public const string TileOverlayBrown = "3a7b793253e1a0f4587097192998c361"; + public const string TileOverlayGreen = "b3e652487789fe54d8d24245d5962c3a"; + public const string TileOverlayOrange = "6cd51fc127b8aac40b2accd3e2666202"; + public const string TileOverlayPurple = "14df766b77b0daf4b82ad93125f66782"; + public const string TileOverlayRed = "5e24183c4537dcf47b16fde5ab1ce0ea"; + public const string TilePlating = "8686fbdb413e33b4395a775c4f2ba990"; + public const string TileReinforced = "df4cf328d472de046bcbc073cbda2868"; + public const string TileWhite = "61201f10ccc2856459a9de99d9cdc52e"; + public const string TileWood = "49f2097d4710d114a89821d9164dfce2"; public const string Toolbelt = "40d904629802fc942860ce878e78efef"; public const string ToolboxBlue = "264ea51d92067c14ebc6633999afac78"; public const string TruckerCap = "1ef3c21a685ec2d4e9f0876719839d5f"; + public const string VendorHotDrinks = "b7976a98a25be4543ba45f1d5e26c072"; + public const string VendorRobustSoftdrinks = "93faf7e7a5c67b9478c57a0d03340256"; + public const string VendorSecTech = "6f2976f635940684da7f7f4ed7855a8d"; + public const string VendorYouTool = "cc1b7e8558e50594089a64af537ff781"; + public const string Vent = "bb2ccbe283c7a7d459f283a7483e04b9"; + public const string WaterCooler = "0188e95eec8518246940499957802de9"; + public const string WaterTank = "d675e0c37e3147a4b8501314b5106f13"; public const string Welder = "06d944205e6b6dd489af078fa85fb878"; public const string Wirecutters = "41a1c8c211dc32c4d8ffca5f0892f9dc"; public const string WoodLog = "2767aeb6e6fd53b43a1cb305789834d4"; From 9b467d7ee685782bd876aa8e22b27b79eaf0df20 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:42:12 -0500 Subject: [PATCH 36/54] Rename WorldObjectAssetReference to ObjectAssetReference and update references throughout the codebase for consistency --- .../AssetDatabasesCodeGenerator.cs | 70 +++++++++---------- .../AssetDatabases/AssetReferenceActor.cs | 7 +- .../Data/AssetDatabases/IWorldObjectAsset.cs | 4 +- ...etReference.cs => ObjectAssetReference.cs} | 8 +-- ...e.cs.meta => ObjectAssetReference.cs.meta} | 0 Assets/Scripts/SS3D/Data/Assets.cs | 2 +- .../SS3D/Systems/Audio/AudioSubSystem.cs | 2 +- Assets/Scripts/SS3D/Systems/Audio/Boombox.cs | 2 +- .../SS3D/Systems/Audio/NoisyCollision.cs | 10 +-- .../SS3D/Systems/Crafting/CraftingMenu.cs | 2 +- .../SS3D/Systems/Crafting/CraftingRecipe.cs | 2 +- .../Systems/Crafting/CraftingSubSystem.cs | 8 +-- .../SS3D/Systems/Crafting/RecipeStep.cs | 6 +- .../SS3D/Systems/Crafting/RecipeStepLink.cs | 4 +- .../SS3D/Systems/Crafting/SecondaryResult.cs | 4 +- .../SS3D/Systems/Inventory/Items/Item.cs | 4 +- Assets/Scripts/SS3D/Systems/Roles/RoleData.cs | 8 +-- .../Scripts/SS3D/Systems/Roles/RoleLoadout.cs | 6 +- .../SS3D/Systems/Roles/RoleSubSystem.cs | 4 +- .../Tile/PlacedObjects/PlacedTileObject.cs | 4 +- .../SS3D/Systems/Tile/SO/GenericObjectSo.cs | 2 +- .../ConstructionHologramManager.cs | 2 +- 22 files changed, 78 insertions(+), 83 deletions(-) rename Assets/Scripts/SS3D/Data/AssetDatabases/{WorldObjectAssetReference.cs => ObjectAssetReference.cs} (89%) rename Assets/Scripts/SS3D/Data/AssetDatabases/{WorldObjectAssetReference.cs.meta => ObjectAssetReference.cs.meta} (100%) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs index 470790d3ad..18269ab921 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs @@ -1,8 +1,6 @@ #if UNITY_EDITOR using Coimbra; -using JetBrains.Annotations; using Serilog; -using System; using System.Collections.Generic; using System.Linq; using UnityEditor; @@ -17,11 +15,11 @@ namespace SS3D.Data.AssetDatabases public static class AssetDatabasesCodeGenerator { /// - /// The path in the project where to put the WorldObjectAssetReference assets. + /// The path in the project where to put the ObjectAssetReference assets. /// private static readonly string WorldObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; - private static readonly Dictionary SavedAssetReferences = new Dictionary(); + private static readonly Dictionary SavedAssetReferences = new Dictionary(); private static bool HasModifiedAssetsWhenGenerating; @@ -85,66 +83,66 @@ private static void CreateWorldObjectAssetReferences(AssetDatabase assetDatabase continue; } - WorldObjectAssetReference worldObjectAssetReference = SavedAssetReferences.Values.ToList().Find(reference => reference.Id == guid && reference.Database == assetDatabase.DatabaseID); + ObjectAssetReference objectAssetReference = SavedAssetReferences.Values.ToList().Find(reference => reference.Id == guid && reference.Database == assetDatabase.DatabaseID); - if (worldObjectAssetReference) + if (objectAssetReference) { - UpdateWorldObjectAssetReference(worldObjectAssetReference, gameObject, ref modifiedAssets); + UpdateWorldObjectAssetReference(objectAssetReference, gameObject, ref modifiedAssets); } else { - worldObjectAssetReference = CreateWorldObjectAssetReference(gameObject.name, guid, assetDatabase.DatabaseID); + objectAssetReference = CreateWorldObjectAssetReference(gameObject.name, guid, assetDatabase.DatabaseID); string key = $"{WorldObjectAssetPath}{gameObject.name}.asset"; - if (!SavedAssetReferences.TryAdd(key, worldObjectAssetReference)) + if (!SavedAssetReferences.TryAdd(key, objectAssetReference)) { Debug.LogError($"[{nameof(AssetDatabasesCodeGenerator)}] - {key} is already on the dictionary"); continue; } - UpdateWorldObjectAssetReference(worldObjectAssetReference, gameObject, ref createdAssets); + UpdateWorldObjectAssetReference(objectAssetReference, gameObject, ref createdAssets); } } if (createdAssets > 0) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {createdAssets} {nameof(WorldObjectAssetReference)} created for {assetDatabase.DatabaseName}."); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {createdAssets} {nameof(ObjectAssetReference)} created for {assetDatabase.DatabaseName}."); } if (modifiedAssets > 0) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {modifiedAssets} {nameof(WorldObjectAssetReference)} modified for {assetDatabase.DatabaseName}."); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {modifiedAssets} {nameof(ObjectAssetReference)} modified for {assetDatabase.DatabaseName}."); } if (modifiedAssets == 0 && createdAssets == 0) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - No {nameof(WorldObjectAssetReference)} were modified or created for {assetDatabase.DatabaseName}."); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - No {nameof(ObjectAssetReference)} were modified or created for {assetDatabase.DatabaseName}."); } } - private static WorldObjectAssetReference CreateWorldObjectAssetReference(string fileName, string gameObjectID, string assetDatabaseName) + private static ObjectAssetReference CreateWorldObjectAssetReference(string fileName, string gameObjectID, string assetDatabaseName) { - WorldObjectAssetReference worldObjectAssetReference = ScriptableObject.CreateInstance(); + ObjectAssetReference objectAssetReference = ScriptableObject.CreateInstance(); - worldObjectAssetReference.Id = gameObjectID; - worldObjectAssetReference.Database = assetDatabaseName; + objectAssetReference.Id = gameObjectID; + objectAssetReference.Database = assetDatabaseName; - UnityEditor.AssetDatabase.CreateAsset(worldObjectAssetReference, $"{WorldObjectAssetPath}{fileName}.asset"); + UnityEditor.AssetDatabase.CreateAsset(objectAssetReference, $"{WorldObjectAssetPath}{fileName}.asset"); HasModifiedAssetsWhenGenerating = true; Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Creating {fileName} WorldObjectReferenceAsset as it was missing."); - return worldObjectAssetReference; + return objectAssetReference; } private static void CleanupWorldObjectAssetReferences(List assetDatabases) { - List> assetsToDestroy = new(); - List> nullSavedAssetReferences = SavedAssetReferences.Where(pair => pair.Value == null).ToList(); + List> assetsToDestroy = new(); + List> nullSavedAssetReferences = SavedAssetReferences.Where(pair => pair.Value == null).ToList(); - foreach (KeyValuePair pair in nullSavedAssetReferences) + foreach (KeyValuePair pair in nullSavedAssetReferences) { SavedAssetReferences.Remove(pair.Key); } @@ -159,7 +157,7 @@ private static void CleanupWorldObjectAssetReferences(List assetD } } - foreach (KeyValuePair savedAsset in SavedAssetReferences) + foreach (KeyValuePair savedAsset in SavedAssetReferences) { if (assetsInDatabases.TryGetValue(savedAsset.Value.Id, out string databaseID) && databaseID == savedAsset.Value.Database) { @@ -169,7 +167,7 @@ private static void CleanupWorldObjectAssetReferences(List assetD assetsToDestroy.Add(savedAsset); } - foreach (KeyValuePair asset in assetsToDestroy) + foreach (KeyValuePair asset in assetsToDestroy) { Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Destroying {asset.Value.name} as there's no prefab associated with it."); @@ -183,47 +181,47 @@ private static void LoadAllWorldObjectAssetReferences() { SavedAssetReferences.Clear(); - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Loading all {nameof(WorldObjectAssetReference)} assets under {WorldObjectAssetPath}"); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Loading all {nameof(ObjectAssetReference)} assets under {WorldObjectAssetPath}"); - string[] loadAllAssetsAtPath = UnityEditor.AssetDatabase.FindAssets($"t:{nameof(WorldObjectAssetReference)}"); + string[] loadAllAssetsAtPath = UnityEditor.AssetDatabase.FindAssets($"t:{nameof(ObjectAssetReference)}"); foreach (string assetGuid in loadAllAssetsAtPath) { string assetPath = UnityEditor.AssetDatabase.GUIDToAssetPath(assetGuid); - WorldObjectAssetReference worldObjectAssetReference = UnityEditor.AssetDatabase.LoadAssetAtPath(assetPath); + ObjectAssetReference objectAssetReference = UnityEditor.AssetDatabase.LoadAssetAtPath(assetPath); - SavedAssetReferences.Add(assetPath, worldObjectAssetReference); + SavedAssetReferences.Add(assetPath, objectAssetReference); } } /// - /// Creates the WorldObjectAssetReference asset in the correct path. + /// Creates the ObjectAssetReference asset in the correct path. /// - /// + /// /// The asset to include in this WorldObjectAsset. /// The related database. - private static void UpdateWorldObjectAssetReference(WorldObjectAssetReference worldObjectAssetReference, GameObject gameObject, ref int modifiedCount) + private static void UpdateWorldObjectAssetReference(ObjectAssetReference objectAssetReference, GameObject gameObject, ref int modifiedCount) { - if (!gameObject.TryGetComponent(out IWorldObjectAsset worldObjectAsset) || worldObjectAsset.Asset == worldObjectAssetReference) + if (!gameObject.TryGetComponent(out IWorldObjectAsset worldObjectAsset) || worldObjectAsset.Asset == objectAssetReference) { return; } - worldObjectAsset.Asset = worldObjectAssetReference; + worldObjectAsset.Asset = objectAssetReference; modifiedCount++; - SetAssetAndPrefabDirty(worldObjectAssetReference, gameObject); + SetAssetAndPrefabDirty(objectAssetReference, gameObject); Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - WorldObjectReferenceAsset reference on {gameObject.name}'s prefab was missing. Fixed."); } - private static void SetAssetAndPrefabDirty(WorldObjectAssetReference worldObjectAssetReference, GameObject gameObject) + private static void SetAssetAndPrefabDirty(ObjectAssetReference objectAssetReference, GameObject gameObject) { HasModifiedAssetsWhenGenerating = true; EditorUtility.SetDirty(gameObject); - EditorUtility.SetDirty(worldObjectAssetReference); + EditorUtility.SetDirty(objectAssetReference); } } } diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetReferenceActor.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetReferenceActor.cs index 6dd0aab4eb..a3acce4f1a 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetReferenceActor.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetReferenceActor.cs @@ -1,7 +1,4 @@ using SS3D.Attributes; -using SS3D.Data.AssetDatabases; -using System.Collections; -using System.Collections.Generic; using UnityEngine; namespace SS3D.Data.AssetDatabases @@ -19,9 +16,9 @@ public class AssetReferenceActor : MonoBehaviour, IWorldObjectAsset [ReadOnly] [Header("This field is filled automatically by the AssetData system.")] #endif - private WorldObjectAssetReference _asset; + private ObjectAssetReference _asset; - public WorldObjectAssetReference Asset + public ObjectAssetReference Asset { get => _asset; set diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/IWorldObjectAsset.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/IWorldObjectAsset.cs index edd0f96bcb..c80276d75e 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/IWorldObjectAsset.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/IWorldObjectAsset.cs @@ -6,9 +6,9 @@ public interface IWorldObjectAsset { /// - /// The reference to the WorldObjectAssetReference asset, which is a way to identify which asset this is without in a more automated manner. + /// The reference to the ObjectAssetReference asset, which is a way to identify which asset this is without in a more automated manner. /// This field is setup by the AssetData system automatically when its implemented on a class. /// - public WorldObjectAssetReference Asset { get; set; } + public ObjectAssetReference Asset { get; set; } } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs similarity index 89% rename from Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs rename to Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 5169a754ee..8edad55370 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -13,11 +13,11 @@ namespace SS3D.Data.AssetDatabases /// This SO is used to reference world object assets in inspector fields without worrying about losing data. /// World object assets are anything that can be placed in the world as a GameObject, like items and tileobjects. /// - public sealed class WorldObjectAssetReference : ScriptableObject + public sealed class ObjectAssetReference : ScriptableObject { #if UNITY_EDITOR /// - /// The path in the project where to put the WorldObjectAssetReference assets. + /// The path in the project where to put the ObjectAssetReference assets. /// public static readonly string WorldObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; #endif @@ -36,7 +36,7 @@ public sealed class WorldObjectAssetReference : ScriptableObject #if UNITY_EDITOR [CanBeNull] - public static WorldObjectAssetReference Create(Object asset) + public static ObjectAssetReference Create(Object asset) { if (!asset) { @@ -45,7 +45,7 @@ public static WorldObjectAssetReference Create(Object asset) return null; } - WorldObjectAssetReference assetReference = CreateInstance(); + ObjectAssetReference assetReference = CreateInstance(); assetReference.Init(asset); string assetPath = System.IO.Path.Combine(WorldObjectAssetPath, $"{asset.name}.asset"); diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs.meta b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs.meta similarity index 100% rename from Assets/Scripts/SS3D/Data/AssetDatabases/WorldObjectAssetReference.cs.meta rename to Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs.meta diff --git a/Assets/Scripts/SS3D/Data/Assets.cs b/Assets/Scripts/SS3D/Data/Assets.cs index f3e11a4932..8fda143fac 100644 --- a/Assets/Scripts/SS3D/Data/Assets.cs +++ b/Assets/Scripts/SS3D/Data/Assets.cs @@ -41,7 +41,7 @@ public static TAsset Get([NotNull] string databaseId, [NotNull] string a /// Returns an asset from a database casting the object found to TAsset. /// [CanBeNull] - public static TAsset Get([NotNull] WorldObjectAssetReference assetReference) + public static TAsset Get([NotNull] ObjectAssetReference assetReference) where TAsset : Object { return GetDatabase(assetReference.Database)?.Get(assetReference.Id); diff --git a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs index a1b6d755ee..9924917a38 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/AudioSubSystem.cs @@ -251,7 +251,7 @@ private static void CreateAudioClipReference() foreach (AudioClip selectedClip in selectedClips) { - WorldObjectAssetReference.Create(selectedClip); + ObjectAssetReference.Create(selectedClip); } } #endif diff --git a/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs b/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs index ee1c1c7da1..c2ef86eff5 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/Boombox.cs @@ -19,7 +19,7 @@ public class Boombox : InteractionTargetNetworkBehaviour, IToggleable private MachinePowerConsumer _powerConsumer; [SerializeField] - private List _songReferences; + private List _songReferences; [SyncVar] public bool AudioOn; diff --git a/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs b/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs index 117fd05d65..d93e5cfb08 100644 --- a/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs +++ b/Assets/Scripts/SS3D/Systems/Audio/NoisyCollision.cs @@ -53,7 +53,7 @@ public class NoisyCollision : MonoBehaviour [SerializeField] [Tooltip("List of references of possible sounds that will play when this object collides lightly.")] - private WorldObjectAssetReference[] _lightImpactSoundReferences; + private ObjectAssetReference[] _lightImpactSoundReferences; // [SerializeField] // [Tooltip("List of possible sounds that will play when this object collides heavily.")] @@ -61,7 +61,7 @@ public class NoisyCollision : MonoBehaviour [SerializeField] [Tooltip("List of references of possible sounds that will play when this object collides heavily.")] - private WorldObjectAssetReference[] _hardImpactSoundReferences; + private ObjectAssetReference[] _hardImpactSoundReferences; //For some reason, this is needed to have an enable/disable feature. Peculiar. private void FixedUpdate() { } @@ -101,17 +101,17 @@ private void OnCollisionEnter(Collision other) /// /// [Server] - private void PlayCollisionSound(WorldObjectAssetReference[] soundPool) + private void PlayCollisionSound(ObjectAssetReference[] soundPool) { float pitch = Random.Range(_basePitch - _pitchModulationLow, _basePitch + _pitchModulationHigh); SubSystems.Get().PlayAudioSource(AudioType.Sfx, PickSound(soundPool).Id, gameObject.transform.position, null, false, _collisionVolume, pitch); } - private WorldObjectAssetReference PickSound(WorldObjectAssetReference[] availableSounds) + private ObjectAssetReference PickSound(ObjectAssetReference[] availableSounds) { // Pick a clip from the supplied array and return it - WorldObjectAssetReference currentClipReference = availableSounds[Random.Range(0, availableSounds.Length)]; + ObjectAssetReference currentClipReference = availableSounds[Random.Range(0, availableSounds.Length)]; return currentClipReference; } diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs index 110e3295b5..057b306c15 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs @@ -186,7 +186,7 @@ private void SetSelectedInteraction(int index, NetworkConnection conn = null) _interactionEvent = _eventForConnection[conn]; List results = new(); - if (_interaction.ChosenLink.Target.IsTerminal && _interaction.ChosenLink.Target.TryGetResult(out WorldObjectAssetReference result)) + if (_interaction.ChosenLink.Target.IsTerminal && _interaction.ChosenLink.Target.TryGetResult(out ObjectAssetReference result)) { results.Add(new (result, 1)); } diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs index 63a973803e..75fb8b870e 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingRecipe.cs @@ -15,7 +15,7 @@ namespace SS3D.Systems.Crafting public class CraftingRecipe : ScriptableObject { [Tooltip("The target of the crafting, what needs to be clicked on by the player to start the crafting.")] - public WorldObjectAssetReference Target; + public ObjectAssetReference Target; [Tooltip("A bunch of recipe steps, representing each steps of the recipe.")] public List Steps; diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs index c864c66ef5..73d2b23c37 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingSubSystem.cs @@ -31,7 +31,7 @@ namespace SS3D.Systems.Crafting public sealed class CraftingSubSystem : NetworkSubSystem { /// - /// First string is the id of the target object of the recipe (as the WorldObjectAssetReference's id). + /// First string is the id of the target object of the recipe (as the ObjectAssetReference's id). /// The value is a list of craftingRecipe, for which the target is the key. /// private readonly Dictionary> _recipeOrganiser = new(); @@ -141,7 +141,7 @@ public void Craft(CraftingInteraction interaction, InteractionEvent interactionE ModifyOrConsumeRecipeTarget(recipeTarget, interaction, interactionEvent, link); - if (link.Target.TryGetResult(out WorldObjectAssetReference result)) + if (link.Target.TryGetResult(out ObjectAssetReference result)) { SpawnOrModifyMainResult(result, interaction, interactionEvent, link); } @@ -185,7 +185,7 @@ private void ModifyOrConsumeRecipeTarget(IRecipeIngredient recipeTarget, Craftin } } - private void SpawnOrModifyMainResult(WorldObjectAssetReference result, CraftingInteraction interaction, + private void SpawnOrModifyMainResult(ObjectAssetReference result, CraftingInteraction interaction, InteractionEvent interactionEvent, TaggedEdge link) { GameObject resultInstance; @@ -551,7 +551,7 @@ private bool TargetIsValid(InteractionEvent interactionEvent) [Server] private bool ResultIsValid(InteractionEvent interactionEvent, RecipeStep recipeStep) { - if (!recipeStep.TryGetResult(out WorldObjectAssetReference recipeResult)) return true; + if (!recipeStep.TryGetResult(out ObjectAssetReference recipeResult)) return true; GameObject recipeResultPrefab = Assets.Get(recipeResult); diff --git a/Assets/Scripts/SS3D/Systems/Crafting/RecipeStep.cs b/Assets/Scripts/SS3D/Systems/Crafting/RecipeStep.cs index 7d4d8547fe..e8eb177ca0 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/RecipeStep.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/RecipeStep.cs @@ -45,7 +45,7 @@ public class RecipeStep [ShowIf(nameof(IsTerminal))] [AllowNesting] [Tooltip("A resulting object that will spawn at the end of the crafting process, optional.")] - public WorldObjectAssetReference Result; + public ObjectAssetReference Result; /// /// If true, show IsInitialState in the inspector @@ -57,7 +57,7 @@ public class RecipeStep /// public string Name => _name; - public WorldObjectAssetReference GetResultOrTarget() => Result ? Result : Recipe.Target; + public ObjectAssetReference GetResultOrTarget() => Result ? Result : Recipe.Target; public RecipeStep(CraftingRecipe recipe, string name) { @@ -68,7 +68,7 @@ public RecipeStep(CraftingRecipe recipe, string name) Result = new(); } - public bool TryGetResult(out WorldObjectAssetReference result) + public bool TryGetResult(out ObjectAssetReference result) { result = Result; return Result is not null; diff --git a/Assets/Scripts/SS3D/Systems/Crafting/RecipeStepLink.cs b/Assets/Scripts/SS3D/Systems/Crafting/RecipeStepLink.cs index f0e9695f83..b4aa57f245 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/RecipeStepLink.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/RecipeStepLink.cs @@ -15,7 +15,7 @@ public class RecipeStepLink { [Tooltip("Elements of the recipe, that will be consumed in the crafting process, and the necessary number of each.")] [SerializeField] - private SerializableDictionary _elements = new(); + private SerializableDictionary _elements = new(); [Tooltip("Bunch of conditions for ingredients to be valid to use in the recipe.")] [SerializeField] @@ -91,7 +91,7 @@ public Dictionary Elements { Dictionary elements = new(); - foreach (KeyValuePair keyValuePair in _elements) + foreach (KeyValuePair keyValuePair in _elements) { elements.Add(keyValuePair.Key.Id, keyValuePair.Value); } diff --git a/Assets/Scripts/SS3D/Systems/Crafting/SecondaryResult.cs b/Assets/Scripts/SS3D/Systems/Crafting/SecondaryResult.cs index f47d297f0b..82f8fac44d 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/SecondaryResult.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/SecondaryResult.cs @@ -6,10 +6,10 @@ namespace SS3D.Systems.Crafting [Serializable] public struct SecondaryResult { - public WorldObjectAssetReference Asset; + public ObjectAssetReference Asset; public uint Amount; - public SecondaryResult(WorldObjectAssetReference asset, uint amount) + public SecondaryResult(ObjectAssetReference asset, uint amount) { Asset = asset; Amount = amount; diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs index 15362c91e4..eb7baebe80 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs @@ -39,7 +39,7 @@ public class Item : InteractionSource, IInteractionTarget, IWorldObjectAsset [ReadOnly] [Header("This field is filled automatically by the AssetData system.")] #endif - private WorldObjectAssetReference _asset; + private ObjectAssetReference _asset; #region Item [Header("Item settings")] @@ -107,7 +107,7 @@ public Collider[] NativeColliders set => _nativeColliders = value; } - public WorldObjectAssetReference Asset + public ObjectAssetReference Asset { get => _asset; set diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs index 0daeada4c1..f4d993f744 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleData.cs @@ -15,9 +15,9 @@ public class RoleData : ScriptableObject [SerializeField] private string _roleName; [SerializeField] - private WorldObjectAssetReference _pdaAsset; + private ObjectAssetReference _pdaAsset; [SerializeField] - private WorldObjectAssetReference _idCardAsset; + private ObjectAssetReference _idCardAsset; [SerializeField] private List _permissions = new(); [SerializeField] @@ -25,9 +25,9 @@ public class RoleData : ScriptableObject public string Name => _roleName; - public WorldObjectAssetReference IDCardAsset => _idCardAsset; + public ObjectAssetReference IDCardAsset => _idCardAsset; - public WorldObjectAssetReference PDAAsset => _pdaAsset; + public ObjectAssetReference PDAAsset => _pdaAsset; public List Permissions => _permissions; diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs index 55b9126747..c449091742 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleLoadout.cs @@ -11,9 +11,9 @@ namespace SS3D.Systems.Roles [CreateAssetMenu(fileName = "Loadout", menuName = "Roles/Loadout")] public class RoleLoadout : ScriptableObject { - public WorldObjectAssetReference HandLeftAsset; - public WorldObjectAssetReference HandRightAsset; + public ObjectAssetReference HandLeftAsset; + public ObjectAssetReference HandRightAsset; - public SerializableDictionary EquipmentAssets; + public SerializableDictionary EquipmentAssets; } } diff --git a/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs b/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs index 97bd3cf324..673fa1f112 100644 --- a/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Roles/RoleSubSystem.cs @@ -209,7 +209,7 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) containers.Add(inventoryContainer.ContainerType, inventoryContainer); } - foreach (KeyValuePair itemToEquip in loadout.EquipmentAssets) + foreach (KeyValuePair itemToEquip in loadout.EquipmentAssets) { if (!itemToEquip.Value) { @@ -241,7 +241,7 @@ private void SpawnLoadoutItems(Entity entity, RoleLoadout loadout) /// /// Condition indicating if the item should be spawned /// Container the item will be spawned in - private Item SpawnItemInSlot(WorldObjectAssetReference assetReference, bool shouldSpawn, AttachedContainer container) + private Item SpawnItemInSlot(ObjectAssetReference assetReference, bool shouldSpawn, AttachedContainer container) { if (!shouldSpawn) { diff --git a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs index 21776e90df..9a8205ea77 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/PlacedObjects/PlacedTileObject.cs @@ -62,7 +62,7 @@ public static PlacedTileObject Create(Vector3 worldPosition, Vector2Int origin, [ReadOnly] [Header("This field is filled automatically by the AssetData system.")] #endif - private WorldObjectAssetReference _asset; + private ObjectAssetReference _asset; [SerializeField] private TileObjectSo _tileObjectSo; @@ -96,7 +96,7 @@ public static PlacedTileObject Create(Vector3 worldPosition, Vector2Int origin, public bool HasAdjacencyConnector => _connector != null; - public WorldObjectAssetReference Asset + public ObjectAssetReference Asset { get => _asset; set diff --git a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs index a215b2be05..2e97db6395 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs @@ -12,7 +12,7 @@ public class GenericObjectSo : ScriptableObject [NotNull] public string NameString => PrefabAsset.name; - public WorldObjectAssetReference PrefabAsset; + public ObjectAssetReference PrefabAsset; public Sprite icon; [SerializeField] diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs index 260c9c60cc..6d24f1cd0a 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileMapCreator/ConstructionHologramManager.cs @@ -174,7 +174,7 @@ public void SetNextRotation() /// /// Instantiate in the correct position and rotation a single hologram. /// - public ConstructionHologram CreateHologram(WorldObjectAssetReference prefabAsset, Vector3 position) + public ConstructionHologram CreateHologram(ObjectAssetReference prefabAsset, Vector3 position) { GameObject prefab = Assets.Get(prefabAsset); GameObject tileObject = Instantiate(prefab); From 613f6994d130c80e5c613dcba942a10bd36c888f Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Wed, 4 Feb 2026 10:56:01 -0500 Subject: [PATCH 37/54] Remove unused variable --- Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs index 2e97db6395..c5cebbe471 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/SO/GenericObjectSo.cs @@ -14,9 +14,5 @@ public class GenericObjectSo : ScriptableObject public ObjectAssetReference PrefabAsset; public Sprite icon; - - [SerializeField] - [HideInInspector] - private string _nameString; } } \ No newline at end of file From 0304522003f366e2ef6517eceaae2650934db28f Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Wed, 4 Feb 2026 11:07:42 -0500 Subject: [PATCH 38/54] Fix formatting and clean up conditions in DatabaseScriptWriter for improved readability --- .../CodeGeneration/Writers/DatabaseScriptWriter.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs index 8beb3940c7..fc61d2ec10 100644 --- a/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs +++ b/Assets/Scripts/SS3D/CodeGeneration/Writers/DatabaseScriptWriter.cs @@ -1,4 +1,5 @@ -using System; +#if UNITY_EDITOR +using System; using System.Collections.Generic; using System.IO; using System.Text; @@ -33,9 +34,9 @@ public static void Write(string filePath, string className, List items, { string itemPath = AssetDatabase.GetAssetPath(item); - if(string.IsNullOrEmpty(itemPath) || !File.Exists(itemPath)) + if (string.IsNullOrEmpty(itemPath)) continue; - + if (!item || string.IsNullOrWhiteSpace(item.name)) continue; @@ -44,9 +45,9 @@ public static void Write(string filePath, string className, List items, StringBuilder stringBuilder = new(); stringBuilder.Append(corrected); - + string guid = AssetDatabase.AssetPathToGUID(itemPath); - + sourceFile.AppendLine($"public const string {stringBuilder} = \"{guid}\";"); } } @@ -55,4 +56,5 @@ public static void Write(string filePath, string className, List items, File.WriteAllText(filePath + "/" + className + ".cs", sourceFile.ToString()); } } -} \ No newline at end of file +} +#endif \ No newline at end of file From 3d137787c96bc86063e2ad8252c325370c693413 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Wed, 4 Feb 2026 11:08:36 -0500 Subject: [PATCH 39/54] Enhance asset retrieval by updating GetAsset methods to accept ObjectAssetReference, and implement IEqualityComparer for improved comparison --- .../Data/AssetDatabases/ObjectAssetReference.cs | 14 +++++++++++++- .../Scripts/SS3D/Systems/Crafting/CraftingMenu.cs | 2 +- .../SS3D/Systems/Inventory/Containers/Hand.cs | 2 +- .../SS3D/Systems/Tile/TileResourceLoader.cs | 14 ++++++++++++++ Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs | 4 ++++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 8edad55370..1e239329f3 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -1,11 +1,14 @@ using JetBrains.Annotations; using SS3D.Attributes; +using System; +using System.Collections.Generic; using System.Linq; #if UNITY_EDITOR using UnityEditor.AddressableAssets; using UnityEditor.AddressableAssets.Settings; #endif using UnityEngine; +using Object = UnityEngine.Object; namespace SS3D.Data.AssetDatabases { @@ -13,7 +16,7 @@ namespace SS3D.Data.AssetDatabases /// This SO is used to reference world object assets in inspector fields without worrying about losing data. /// World object assets are anything that can be placed in the world as a GameObject, like items and tileobjects. /// - public sealed class ObjectAssetReference : ScriptableObject + public sealed class ObjectAssetReference : ScriptableObject, IEqualityComparer { #if UNITY_EDITOR /// @@ -34,6 +37,15 @@ public sealed class ObjectAssetReference : ScriptableObject [Header("This file is auto-generated, do not modify it manually")] public string Database; + public bool Equals(ObjectAssetReference x, ObjectAssetReference y) => x && y + && x.Id.Equals(y.Id, StringComparison.OrdinalIgnoreCase) && x.Database.Equals(y.Database, StringComparison.OrdinalIgnoreCase); + + public int GetHashCode(ObjectAssetReference reference) + { + ScriptableObject baseReference = reference; + return baseReference.GetHashCode(); + } + #if UNITY_EDITOR [CanBeNull] public static ObjectAssetReference Create(Object asset) diff --git a/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs b/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs index 057b306c15..268700a991 100644 --- a/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs +++ b/Assets/Scripts/SS3D/Systems/Crafting/CraftingMenu.cs @@ -230,7 +230,7 @@ private void TargetSetVisuals(NetworkConnection conn, List resu foreach (SecondaryResult result in results) { - GenericObjectSo asset = SubSystems.Get().GetAsset(result.Asset.Id); + GenericObjectSo asset = SubSystems.Get().GetAsset(result.Asset); GameObject pictureSlot = Instantiate(_pictureSlotPrefab, _pictureSlotArea.transform); pictureSlot.GetComponent().Setup(asset, result.Amount); } diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs b/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs index 523408431a..8a8fb53c98 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs @@ -137,7 +137,7 @@ public void PlaceHeldItemOutOfHand(Vector3 position, Quaternion rotation) TileMap tileMap = SubSystems.Get().CurrentMap; if (tileMap != null) { - ItemObjectSo itemObjectSo = SubSystems.Get().GetAsset(item.Asset.Id) as ItemObjectSo; + ItemObjectSo itemObjectSo = SubSystems.Get().GetAsset(item.Asset) as ItemObjectSo; if (itemObjectSo != null) { tileMap.PlaceItemObject(position, rotation, itemObjectSo, item.gameObject); diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs b/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs index c6e25bb6f3..13bbc9d657 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileResourceLoader.cs @@ -1,4 +1,5 @@ using JetBrains.Annotations; +using SS3D.Data.AssetDatabases; using SS3D.Logging; using System; using System.Collections; @@ -81,5 +82,18 @@ public GenericObjectSo GetAsset(string assetName) return genericObjectSo; } + + [CanBeNull] + public GenericObjectSo GetAsset(ObjectAssetReference asset) + { + GenericObjectSo genericObjectSo = Assets.FirstOrDefault(tileObject => tileObject.PrefabAsset.Equals(asset)); + + if (!genericObjectSo) + { + Log.Warning(this, "Requested tile asset {assetName} was not found.", Logs.Generic, asset); + } + + return genericObjectSo; + } } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs b/Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs index ea91f6900a..0922852018 100644 --- a/Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs +++ b/Assets/Scripts/SS3D/Systems/Tile/TileSubSystem.cs @@ -1,6 +1,7 @@ using Cysharp.Threading.Tasks; using FishNet.Object; using SS3D.Core.Behaviours; +using SS3D.Data.AssetDatabases; using SS3D.Data.Management; using SS3D.Logging; using System; @@ -81,6 +82,9 @@ private void CreateMap(string mapName) [ServerOrClient] public GenericObjectSo GetAsset(string assetName) => Loader.GetAsset(assetName); + [ServerOrClient] + public GenericObjectSo GetAsset(ObjectAssetReference asset) => Loader.GetAsset(asset); + [Server] private bool PlaceObject(GenericObjectSo genericObjectSo, Vector3 placePosition, Direction dir, bool replaceExisting) { From 22a2825196c195ceecb56fc8955e508613e5517e Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Wed, 4 Feb 2026 11:41:37 -0500 Subject: [PATCH 40/54] Refactor ObjectAssetReference class by removing IEqualityComparer implementation and simplifying equality and hash code methods --- .../SS3D/Data/AssetDatabases/ObjectAssetReference.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 1e239329f3..af37d9c460 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; using SS3D.Attributes; using System; -using System.Collections.Generic; using System.Linq; #if UNITY_EDITOR using UnityEditor.AddressableAssets; @@ -16,7 +15,7 @@ namespace SS3D.Data.AssetDatabases /// This SO is used to reference world object assets in inspector fields without worrying about losing data. /// World object assets are anything that can be placed in the world as a GameObject, like items and tileobjects. /// - public sealed class ObjectAssetReference : ScriptableObject, IEqualityComparer + public sealed class ObjectAssetReference : ScriptableObject { #if UNITY_EDITOR /// @@ -37,14 +36,9 @@ public sealed class ObjectAssetReference : ScriptableObject, IEqualityComparer x && y - && x.Id.Equals(y.Id, StringComparison.OrdinalIgnoreCase) && x.Database.Equals(y.Database, StringComparison.OrdinalIgnoreCase); + public override bool Equals(object other) => other is ObjectAssetReference otherReference && Id.Equals(otherReference.Id) && Database.Equals(otherReference.Database); - public int GetHashCode(ObjectAssetReference reference) - { - ScriptableObject baseReference = reference; - return baseReference.GetHashCode(); - } + public override int GetHashCode() => base.GetHashCode(); #if UNITY_EDITOR [CanBeNull] From 829cfe1c03c298bb0d397d72e5491a49abb3521f Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Wed, 11 Feb 2026 16:21:43 -0500 Subject: [PATCH 41/54] Update item spawning in VendingMachine to use PrefabAsset ID --- Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs index 1d8eec98ed..35eacc79c0 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/VendingMachine.cs @@ -89,7 +89,7 @@ public void DispenseProduct(int productIndex) ItemSubSystem itemSystem = SubSystems.Get(); Quaternion quaternion = Quaternion.Euler(new Vector3(Random.Range(0, 360), Random.Range(0, 360), Random.Range(0, 360))); - itemSystem.SpawnItem(productToDispenseStock.Product.name, _dispensingTransform.position, quaternion); + itemSystem.SpawnItem(productToDispenseStock.Product.PrefabAsset.Id, _dispensingTransform.position, quaternion); } /// From 0ae98c1dd399e4dc6d660dfdb2c16e4e867cd99b Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:27:46 -0500 Subject: [PATCH 42/54] Rename WorldObjectAssetPath to ObjectAssetPath for clarity in asset management --- .../Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index af37d9c460..b75da59f48 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -21,7 +21,7 @@ public sealed class ObjectAssetReference : ScriptableObject /// /// The path in the project where to put the ObjectAssetReference assets. /// - public static readonly string WorldObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; + public static readonly string ObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; #endif #if UNITY_EDITOR @@ -54,7 +54,7 @@ public static ObjectAssetReference Create(Object asset) ObjectAssetReference assetReference = CreateInstance(); assetReference.Init(asset); - string assetPath = System.IO.Path.Combine(WorldObjectAssetPath, $"{asset.name}.asset"); + string assetPath = System.IO.Path.Combine(ObjectAssetPath, $"{asset.name}.asset"); UnityEditor.AssetDatabase.CreateAsset(assetReference, assetPath); UnityEditor.AssetDatabase.SaveAssetIfDirty(assetReference); From 77b35c698c3d74e869c401cd43cb22e5342dfef8 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:32:17 -0500 Subject: [PATCH 43/54] Remove redundant GetHashCode implementation in ObjectAssetReference class --- Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index b75da59f48..98d5213571 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -38,8 +38,6 @@ public sealed class ObjectAssetReference : ScriptableObject public override bool Equals(object other) => other is ObjectAssetReference otherReference && Id.Equals(otherReference.Id) && Database.Equals(otherReference.Database); - public override int GetHashCode() => base.GetHashCode(); - #if UNITY_EDITOR [CanBeNull] public static ObjectAssetReference Create(Object asset) From be9b00bcc600f0fadb767f9b477b2b5ef430bc48 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:34:23 -0500 Subject: [PATCH 44/54] Replace Debug.LogError with Log.Error for improved error logging in ObjectAssetReference class --- .../SS3D/Data/AssetDatabases/ObjectAssetReference.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 98d5213571..82ccd31730 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -64,7 +64,7 @@ private void Init(Object asset) { if (!asset) { - Debug.LogError("No asset found."); + Log.Error(this, "No asset found."); return; } @@ -76,7 +76,8 @@ private void Init(Object asset) AddressableAssetEntry entry = settings.FindAssetEntry(guid); if (entry == null) { - Debug.LogError($"Asset {asset.name} with GUID {guid} not found in Addressable Asset Settings."); + Log.Error(this, $"Asset {asset.name} with GUID {guid} not found in Addressable Asset Settings." + return; } @@ -84,7 +85,8 @@ private void Init(Object asset) if (!databaseSettings) { - Debug.LogError("AssetDatabaseSettings not found."); + Log.Error(this, "AssetDatabaseSettings not found."); + return; } From 9104912c7ee14e9e05a8c6e09a7a2c0fd6f3f949 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:35:07 -0500 Subject: [PATCH 45/54] Change ObjectAssetPath from public to private for encapsulation in ObjectAssetReference class --- Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 82ccd31730..ffe2ac5a25 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -21,7 +21,7 @@ public sealed class ObjectAssetReference : ScriptableObject /// /// The path in the project where to put the ObjectAssetReference assets. /// - public static readonly string ObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; + private const string ObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; #endif #if UNITY_EDITOR From e60e07fcd792240ce8c142e07d4a0a637c6ca4a8 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:35:26 -0500 Subject: [PATCH 46/54] Refactor ObjectAssetReference class for improved readability and maintainability --- .../AssetDatabases/ObjectAssetReference.cs | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index ffe2ac5a25..6457e41d11 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -1,40 +1,40 @@ using JetBrains.Annotations; using SS3D.Attributes; -using System; using System.Linq; +using UnityEngine; +using Object = UnityEngine.Object; #if UNITY_EDITOR +using SS3D.Logging; using UnityEditor.AddressableAssets; using UnityEditor.AddressableAssets.Settings; - #endif -using UnityEngine; -using Object = UnityEngine.Object; +#endif namespace SS3D.Data.AssetDatabases { - /// - /// This SO is used to reference world object assets in inspector fields without worrying about losing data. - /// World object assets are anything that can be placed in the world as a GameObject, like items and tileobjects. - /// - public sealed class ObjectAssetReference : ScriptableObject - { + /// + /// This SO is used to reference world object assets in inspector fields without worrying about losing data. + /// World object assets are anything that can be placed in the world as a GameObject, like items and tileobjects. + /// + public sealed class ObjectAssetReference : ScriptableObject + { #if UNITY_EDITOR /// /// The path in the project where to put the ObjectAssetReference assets. /// private const string ObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; #endif - + #if UNITY_EDITOR - [ReadOnly] + [ReadOnly] #endif - [Header("This file is auto-generated, do not modify it manually")] - public string Id; + [Header("This file is auto-generated, do not modify it manually")] + public string Id; #if UNITY_EDITOR - [ReadOnly] + [ReadOnly] #endif - [Header("This file is auto-generated, do not modify it manually")] - public string Database; + [Header("This file is auto-generated, do not modify it manually")] + public string Database; public override bool Equals(object other) => other is ObjectAssetReference otherReference && Id.Equals(otherReference.Id) && Database.Equals(otherReference.Database); @@ -68,19 +68,20 @@ private void Init(Object asset) return; } - + string assetPath = UnityEditor.AssetDatabase.GetAssetPath(asset); string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath); - + AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings; AddressableAssetEntry entry = settings.FindAssetEntry(guid); + if (entry == null) { Log.Error(this, $"Asset {asset.name} with GUID {guid} not found in Addressable Asset Settings." return; } - + AssetDatabaseSettings databaseSettings = Coimbra.ScriptableSettings.GetOrFind(); if (!databaseSettings) @@ -89,11 +90,12 @@ private void Init(Object asset) return; } - + foreach (AssetDatabase database in databaseSettings.IncludedAssetDatabases.Where(database => database.AssetGroup == entry.parentGroup)) { Id = guid; Database = database.DatabaseID; + break; } } From 2a1e49e0acf225e6b4c882cc14b004c81a61014d Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sat, 21 Feb 2026 17:40:25 -0500 Subject: [PATCH 47/54] Expose ObjectAssetPath as public constant for improved accessibility in asset management --- .../AssetDatabases/AssetDatabasesCodeGenerator.cs | 11 +++-------- .../SS3D/Data/AssetDatabases/ObjectAssetReference.cs | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs index 18269ab921..806642ddde 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs @@ -14,11 +14,6 @@ namespace SS3D.Data.AssetDatabases /// public static class AssetDatabasesCodeGenerator { - /// - /// The path in the project where to put the ObjectAssetReference assets. - /// - private static readonly string WorldObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; - private static readonly Dictionary SavedAssetReferences = new Dictionary(); private static bool HasModifiedAssetsWhenGenerating; @@ -93,7 +88,7 @@ private static void CreateWorldObjectAssetReferences(AssetDatabase assetDatabase { objectAssetReference = CreateWorldObjectAssetReference(gameObject.name, guid, assetDatabase.DatabaseID); - string key = $"{WorldObjectAssetPath}{gameObject.name}.asset"; + string key = $"{ObjectAssetReference.ObjectAssetPath}{gameObject.name}.asset"; if (!SavedAssetReferences.TryAdd(key, objectAssetReference)) { @@ -128,7 +123,7 @@ private static ObjectAssetReference CreateWorldObjectAssetReference(string fileN objectAssetReference.Id = gameObjectID; objectAssetReference.Database = assetDatabaseName; - UnityEditor.AssetDatabase.CreateAsset(objectAssetReference, $"{WorldObjectAssetPath}{fileName}.asset"); + UnityEditor.AssetDatabase.CreateAsset(objectAssetReference, $"{ObjectAssetReference.ObjectAssetPath}{fileName}.asset"); HasModifiedAssetsWhenGenerating = true; @@ -181,7 +176,7 @@ private static void LoadAllWorldObjectAssetReferences() { SavedAssetReferences.Clear(); - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Loading all {nameof(ObjectAssetReference)} assets under {WorldObjectAssetPath}"); + Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Loading all {nameof(ObjectAssetReference)} assets under {ObjectAssetReference.ObjectAssetPath}"); string[] loadAllAssetsAtPath = UnityEditor.AssetDatabase.FindAssets($"t:{nameof(ObjectAssetReference)}"); diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 6457e41d11..15611f0248 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -21,7 +21,7 @@ public sealed class ObjectAssetReference : ScriptableObject /// /// The path in the project where to put the ObjectAssetReference assets. /// - private const string ObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; + public const string ObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; #endif #if UNITY_EDITOR From d356bbe12da12e6715c7822189c5059d690b632c Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sat, 21 Feb 2026 18:00:09 -0500 Subject: [PATCH 48/54] Improve logging in AssetDatabasesCodeGenerator for better clarity and consistency --- .../AssetDatabasesCodeGenerator.cs | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs index 806642ddde..d949d73ed5 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/AssetDatabasesCodeGenerator.cs @@ -1,5 +1,6 @@ #if UNITY_EDITOR using Coimbra; +using JetBrains.Annotations; using Serilog; using System.Collections.Generic; using System.Linq; @@ -25,15 +26,15 @@ public static void GenerateAssetDatabasesCode() { AssetDatabaseSettings settings = ScriptableSettings.GetOrFind(); - if (settings == null) + if (!settings) { - Log.Error($"{nameof(AssetDatabasesCodeGenerator)} - Asset database settings has not be found"); + Log.Error("{AssetDatabasesCodeGeneratorName} - Asset database settings has not be found", nameof(AssetDatabasesCodeGenerator)); return; } if (settings.IncludedAssetDatabases == null || settings.IncludedAssetDatabases.Count == 0) { - Log.Error($"{nameof(AssetDatabasesCodeGenerator)} - No Databases have been found"); + Log.Error("{AssetDatabasesCodeGeneratorName} - No Databases have been found", nameof(AssetDatabasesCodeGenerator)); return; } @@ -92,7 +93,7 @@ private static void CreateWorldObjectAssetReferences(AssetDatabase assetDatabase if (!SavedAssetReferences.TryAdd(key, objectAssetReference)) { - Debug.LogError($"[{nameof(AssetDatabasesCodeGenerator)}] - {key} is already on the dictionary"); + Log.Error("[{AssetDatabasesCodeGeneratorName}] - {Key} is already on the dictionary", nameof(AssetDatabasesCodeGenerator), key); continue; } @@ -102,20 +103,21 @@ private static void CreateWorldObjectAssetReferences(AssetDatabase assetDatabase if (createdAssets > 0) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {createdAssets} {nameof(ObjectAssetReference)} created for {assetDatabase.DatabaseName}."); + Log.Information("[{AssetDatabasesCodeGeneratorName}] - {CreatedAssets} {ObjectAssetReferenceName} created for {AssetDatabaseDatabaseName}.", nameof(AssetDatabasesCodeGenerator), createdAssets, nameof(ObjectAssetReference), assetDatabase.DatabaseName); } if (modifiedAssets > 0) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - {modifiedAssets} {nameof(ObjectAssetReference)} modified for {assetDatabase.DatabaseName}."); + Log.Information("[{AssetDatabasesCodeGeneratorName}] - {ModifiedAssets} {ObjectAssetReferenceName} modified for {AssetDatabaseDatabaseName}.", nameof(AssetDatabasesCodeGenerator), modifiedAssets, nameof(ObjectAssetReference), assetDatabase.DatabaseName); } if (modifiedAssets == 0 && createdAssets == 0) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - No {nameof(ObjectAssetReference)} were modified or created for {assetDatabase.DatabaseName}."); + Log.Information("[{AssetDatabasesCodeGeneratorName}] - No {ObjectAssetReferenceName} were modified or created for {AssetDatabaseDatabaseName}.", nameof(AssetDatabasesCodeGenerator), nameof(ObjectAssetReference), assetDatabase.DatabaseName); } } + [NotNull] private static ObjectAssetReference CreateWorldObjectAssetReference(string fileName, string gameObjectID, string assetDatabaseName) { ObjectAssetReference objectAssetReference = ScriptableObject.CreateInstance(); @@ -127,7 +129,7 @@ private static ObjectAssetReference CreateWorldObjectAssetReference(string fileN HasModifiedAssetsWhenGenerating = true; - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Creating {fileName} WorldObjectReferenceAsset as it was missing."); + Log.Information("[{AssetDatabasesCodeGeneratorName}] - Creating {FileName} WorldObjectReferenceAsset as it was missing.", nameof(AssetDatabasesCodeGenerator), fileName); return objectAssetReference; } @@ -135,7 +137,7 @@ private static ObjectAssetReference CreateWorldObjectAssetReference(string fileN private static void CleanupWorldObjectAssetReferences(List assetDatabases) { List> assetsToDestroy = new(); - List> nullSavedAssetReferences = SavedAssetReferences.Where(pair => pair.Value == null).ToList(); + List> nullSavedAssetReferences = SavedAssetReferences.Where(pair => !pair.Value).ToList(); foreach (KeyValuePair pair in nullSavedAssetReferences) { @@ -164,7 +166,7 @@ private static void CleanupWorldObjectAssetReferences(List assetD foreach (KeyValuePair asset in assetsToDestroy) { - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Destroying {asset.Value.name} as there's no prefab associated with it."); + Log.Information("[{AssetDatabasesCodeGeneratorName}] - Destroying {ValueName} as there's no prefab associated with it.", nameof(AssetDatabasesCodeGenerator), asset.Value.name); HasModifiedAssetsWhenGenerating = true; @@ -176,7 +178,7 @@ private static void LoadAllWorldObjectAssetReferences() { SavedAssetReferences.Clear(); - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - Loading all {nameof(ObjectAssetReference)} assets under {ObjectAssetReference.ObjectAssetPath}"); + Log.Information("[{AssetDatabasesCodeGeneratorName}] - Loading all {ObjectAssetReferenceName} assets under {Path}", nameof(AssetDatabasesCodeGenerator), nameof(ObjectAssetReference), ObjectAssetReference.ObjectAssetPath); string[] loadAllAssetsAtPath = UnityEditor.AssetDatabase.FindAssets($"t:{nameof(ObjectAssetReference)}"); @@ -194,7 +196,7 @@ private static void LoadAllWorldObjectAssetReferences() /// /// /// The asset to include in this WorldObjectAsset. - /// The related database. + /// reference for modified objects count private static void UpdateWorldObjectAssetReference(ObjectAssetReference objectAssetReference, GameObject gameObject, ref int modifiedCount) { if (!gameObject.TryGetComponent(out IWorldObjectAsset worldObjectAsset) || worldObjectAsset.Asset == objectAssetReference) @@ -208,7 +210,7 @@ private static void UpdateWorldObjectAssetReference(ObjectAssetReference objectA SetAssetAndPrefabDirty(objectAssetReference, gameObject); - Debug.Log($"[{nameof(AssetDatabasesCodeGenerator)}] - WorldObjectReferenceAsset reference on {gameObject.name}'s prefab was missing. Fixed."); + Log.Information("[{AssetDatabasesCodeGeneratorName}] - WorldObjectReferenceAsset reference on {GameObjectName}'s prefab was missing. Fixed.", nameof(AssetDatabasesCodeGenerator), gameObject.name); } private static void SetAssetAndPrefabDirty(ObjectAssetReference objectAssetReference, GameObject gameObject) From 064552b5e899fc71274d9c77f4cfce541f6c1204 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sat, 21 Feb 2026 18:22:07 -0500 Subject: [PATCH 49/54] Refactor ObjectAssetReference class to separate editor-specific functionality and improve code organization --- .../ObjectAssetReference.Editor.cs | 81 ++++++++++++++++++ .../ObjectAssetReference.Editor.cs.meta | 3 + .../AssetDatabases/ObjectAssetReference.cs | 83 +------------------ 3 files changed, 86 insertions(+), 81 deletions(-) create mode 100644 Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs create mode 100644 Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs.meta diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs new file mode 100644 index 0000000000..b68d2c70f0 --- /dev/null +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs @@ -0,0 +1,81 @@ +using JetBrains.Annotations; +using SS3D.Logging; +using System.Linq; +using UnityEditor.AddressableAssets; +using UnityEditor.AddressableAssets.Settings; +using UnityEngine; + +#if UNITY_EDITOR +namespace SS3D.Data.AssetDatabases +{ + public partial class ObjectAssetReference + { + /// + /// The path in the project where to put the ObjectAssetReference assets. + /// + public const string ObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; + + + [CanBeNull] + public static ObjectAssetReference Create(Object asset) + { + if (!asset) + { + Debug.LogError("No asset found."); + + return null; + } + + ObjectAssetReference assetReference = CreateInstance(); + assetReference.Init(asset); + + string assetPath = System.IO.Path.Combine(ObjectAssetPath, $"{asset.name}.asset"); + + UnityEditor.AssetDatabase.CreateAsset(assetReference, assetPath); + UnityEditor.AssetDatabase.SaveAssetIfDirty(assetReference); + + return assetReference; + } + + private void Init(Object asset) + { + if (!asset) + { + Log.Error(this, "No asset found."); + + return; + } + + string assetPath = UnityEditor.AssetDatabase.GetAssetPath(asset); + string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath); + + AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings; + AddressableAssetEntry entry = settings.FindAssetEntry(guid); + + if (entry == null) + { + Log.Error(this, $"Asset {asset.name} with GUID {guid} not found in Addressable Asset Settings." + + return; + } + + AssetDatabaseSettings databaseSettings = Coimbra.ScriptableSettings.GetOrFind(); + + if (!databaseSettings) + { + Log.Error(this, "AssetDatabaseSettings not found."); + + return; + } + + foreach (AssetDatabase database in databaseSettings.IncludedAssetDatabases.Where(database => database.AssetGroup == entry.parentGroup)) + { + Id = guid; + Database = database.DatabaseID; + + break; + } + } + } +} +#endif \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs.meta b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs.meta new file mode 100644 index 0000000000..b2dd709086 --- /dev/null +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1a84605b91894b419c4868c47636eceb +timeCreated: 1771715696 \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 15611f0248..532baad284 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -1,13 +1,5 @@ -using JetBrains.Annotations; -using SS3D.Attributes; -using System.Linq; +using SS3D.Attributes; using UnityEngine; -using Object = UnityEngine.Object; -#if UNITY_EDITOR -using SS3D.Logging; -using UnityEditor.AddressableAssets; -using UnityEditor.AddressableAssets.Settings; -#endif namespace SS3D.Data.AssetDatabases { @@ -15,15 +7,8 @@ namespace SS3D.Data.AssetDatabases /// This SO is used to reference world object assets in inspector fields without worrying about losing data. /// World object assets are anything that can be placed in the world as a GameObject, like items and tileobjects. /// - public sealed class ObjectAssetReference : ScriptableObject + public sealed partial class ObjectAssetReference : ScriptableObject { -#if UNITY_EDITOR - /// - /// The path in the project where to put the ObjectAssetReference assets. - /// - public const string ObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; -#endif - #if UNITY_EDITOR [ReadOnly] #endif @@ -37,69 +22,5 @@ public sealed class ObjectAssetReference : ScriptableObject public string Database; public override bool Equals(object other) => other is ObjectAssetReference otherReference && Id.Equals(otherReference.Id) && Database.Equals(otherReference.Database); - -#if UNITY_EDITOR - [CanBeNull] - public static ObjectAssetReference Create(Object asset) - { - if (!asset) - { - Debug.LogError("No asset found."); - - return null; - } - - ObjectAssetReference assetReference = CreateInstance(); - assetReference.Init(asset); - - string assetPath = System.IO.Path.Combine(ObjectAssetPath, $"{asset.name}.asset"); - - UnityEditor.AssetDatabase.CreateAsset(assetReference, assetPath); - UnityEditor.AssetDatabase.SaveAssetIfDirty(assetReference); - - return assetReference; - } - - private void Init(Object asset) - { - if (!asset) - { - Log.Error(this, "No asset found."); - - return; - } - - string assetPath = UnityEditor.AssetDatabase.GetAssetPath(asset); - string guid = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath); - - AddressableAssetSettings settings = AddressableAssetSettingsDefaultObject.Settings; - AddressableAssetEntry entry = settings.FindAssetEntry(guid); - - if (entry == null) - { - Log.Error(this, $"Asset {asset.name} with GUID {guid} not found in Addressable Asset Settings." - - return; - } - - AssetDatabaseSettings databaseSettings = Coimbra.ScriptableSettings.GetOrFind(); - - if (!databaseSettings) - { - Log.Error(this, "AssetDatabaseSettings not found."); - - return; - } - - foreach (AssetDatabase database in databaseSettings.IncludedAssetDatabases.Where(database => database.AssetGroup == entry.parentGroup)) - { - Id = guid; - Database = database.DatabaseID; - - break; - } - } - - #endif } } \ No newline at end of file From 8b88fce91f0f6643eb3f41ad344f45e21f92ab89 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sat, 21 Feb 2026 18:24:08 -0500 Subject: [PATCH 50/54] Format Equals method in ObjectAssetReference class for improved readability --- .../Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs index 532baad284..fe5255ce63 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.cs @@ -21,6 +21,8 @@ public sealed partial class ObjectAssetReference : ScriptableObject [Header("This file is auto-generated, do not modify it manually")] public string Database; - public override bool Equals(object other) => other is ObjectAssetReference otherReference && Id.Equals(otherReference.Id) && Database.Equals(otherReference.Database); + public override bool Equals(object other) + => other is ObjectAssetReference otherReference && + Id.Equals(otherReference.Id) && Database.Equals(otherReference.Database); } } \ No newline at end of file From 406d54b35ba82b819ac7deb3074e8c66b8c1927c Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sun, 22 Feb 2026 14:57:12 -0500 Subject: [PATCH 51/54] -_-, I'm sorry --- .../SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs index b68d2c70f0..15e55a1658 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs @@ -54,7 +54,7 @@ private void Init(Object asset) if (entry == null) { - Log.Error(this, $"Asset {asset.name} with GUID {guid} not found in Addressable Asset Settings." + Log.Error(this, $"Asset {asset.name} with GUID {guid} not found in Addressable Asset Settings."); return; } From 761bd22cc60bf56e71e702e81ccc0eb2e258b95b Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sun, 22 Feb 2026 15:03:22 -0500 Subject: [PATCH 52/54] Changed Debug.LogError to Log.Error --- .../SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs index 15e55a1658..e5b9537f30 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs @@ -21,7 +21,7 @@ public static ObjectAssetReference Create(Object asset) { if (!asset) { - Debug.LogError("No asset found."); + Log.Error(typeof(ObjectAssetReference), "No asset found."); return null; } From 4e6e09acaa414ee618f4d1f42aeee47c95f6cdd6 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Sun, 22 Feb 2026 15:06:10 -0500 Subject: [PATCH 53/54] Changed ObjectAssetReferences path --- ...rldObjectAssetReferences.meta => ObjectAssetReferences.meta} | 0 .../APC.asset | 0 .../APC.asset.meta | 0 .../AirAlarm.asset | 0 .../AirAlarm.asset.meta | 0 .../AtmosPipesL1.asset | 0 .../AtmosPipesL1.asset.meta | 0 .../AtmosPipesL2.asset | 0 .../AtmosPipesL2.asset.meta | 0 .../AtmosPipesL3.asset | 0 .../AtmosPipesL3.asset.meta | 0 .../AtmosPipesL4.asset | 0 .../AtmosPipesL4.asset.meta | 0 .../AttackParticles.asset | 0 .../AttackParticles.asset.meta | 0 .../Backpack.asset | 0 .../Backpack.asset.meta | 0 .../BikeHorn.asset | 0 .../BikeHorn.asset.meta | 0 .../BleedingParticle.asset | 0 .../BleedingParticle.asset.meta | 0 .../Blender.asset | 0 .../Blender.asset.meta | 0 .../Boombox.asset | 0 .../Boombox.asset.meta | 0 .../BrutePatch.asset | 0 .../BrutePatch.asset.meta | 0 .../BurnPatch.asset | 0 .../BurnPatch.asset.meta | 0 .../Cables.asset | 0 .../Cables.asset.meta | 0 .../Can1.asset | 0 .../Can1.asset.meta | 0 .../Can2.asset | 0 .../Can2.asset.meta | 0 .../Can3.asset | 0 .../Can3.asset.meta | 0 .../Can4.asset | 0 .../Can4.asset.meta | 0 .../Catwalk.asset | 0 .../Catwalk.asset.meta | 0 .../ChemicalDispenser.asset | 0 .../ChemicalDispenser.asset.meta | 0 .../CivillianAirlock.asset | 0 .../CivillianAirlock.asset.meta | 0 .../ConstructionParticle.asset | 0 .../ConstructionParticle.asset.meta | 0 .../Crowbar.asset | 0 .../Crowbar.asset.meta | 0 .../Cryotube.asset | 0 .../Cryotube.asset.meta | 0 .../DinnerBooth.asset | 0 .../DinnerBooth.asset.meta | 0 .../DisposalBin.asset | 0 .../DisposalBin.asset.meta | 0 .../DisposalOutlet.asset | 0 .../DisposalOutlet.asset.meta | 0 .../DisposalPipes.asset | 0 .../DisposalPipes.asset.meta | 0 .../DonkPocket.asset | 0 .../DonkPocket.asset.meta | 0 .../Doodad.asset | 0 .../Doodad.asset.meta | 0 .../ElectricalCable.asset | 0 .../ElectricalCable.asset.meta | 0 .../ElectricalWire.asset | 0 .../ElectricalWire.asset.meta | 0 .../FacewearGasMask.asset | 0 .../FacewearGasMask.asset.meta | 0 .../FancyCarpetRed.asset | 0 .../FancyCarpetRed.asset.meta | 0 .../FireAlarm.asset | 0 .../FireAlarm.asset.meta | 0 .../FlashlightBlue.asset | 0 .../FlashlightBlue.asset.meta | 0 .../FloorTile.asset | 0 .../FloorTile.asset.meta | 0 .../FuelTank.asset | 0 .../FuelTank.asset.meta | 0 .../Gibber.asset | 0 .../Gibber.asset.meta | 0 .../GlassReinforcedSheet.asset | 0 .../GlassReinforcedSheet.asset.meta | 0 .../GlassShard.asset | 0 .../GlassShard.asset.meta | 0 .../GlassSheet.asset | 0 .../GlassSheet.asset.meta | 0 .../GloveInsulated.asset | 0 .../GloveInsulated.asset.meta | 0 .../Hatchet.asset | 0 .../Hatchet.asset.meta | 0 .../Headset.asset | 0 .../Headset.asset.meta | 0 .../HeadsetSecurity.asset | 0 .../HeadsetSecurity.asset.meta | 0 .../HealthScanner.asset | 0 .../HealthScanner.asset.meta | 0 .../HumanArmLeft.asset | 0 .../HumanArmLeft.asset.meta | 0 .../HumanArmRight.asset | 0 .../HumanArmRight.asset.meta | 0 .../HumanBrain.asset | 0 .../HumanBrain.asset.meta | 0 .../HumanEarLeft.asset | 0 .../HumanEarLeft.asset.meta | 0 .../HumanEarRight.asset | 0 .../HumanEarRight.asset.meta | 0 .../HumanEye.asset | 0 .../HumanEye.asset.meta | 0 .../HumanFootLeft.asset | 0 .../HumanFootLeft.asset.meta | 0 .../HumanFootRight.asset | 0 .../HumanFootRight.asset.meta | 0 .../HumanHandLeft.asset | 0 .../HumanHandLeft.asset.meta | 0 .../HumanHandRight.asset | 0 .../HumanHandRight.asset.meta | 0 .../HumanHead.asset | 0 .../HumanHead.asset.meta | 0 .../HumanHeart.asset | 0 .../HumanHeart.asset.meta | 0 .../HumanIntestineLarge.asset | 0 .../HumanIntestineLarge.asset.meta | 0 .../HumanIntestineSmall.asset | 0 .../HumanIntestineSmall.asset.meta | 0 .../HumanLegLeft.asset | 0 .../HumanLegLeft.asset.meta | 0 .../HumanLegRight.asset | 0 .../HumanLegRight.asset.meta | 0 .../HumanLiver.asset | 0 .../HumanLiver.asset.meta | 0 .../HumanLungLeft.asset | 0 .../HumanLungLeft.asset.meta | 0 .../HumanLungRight.asset | 0 .../HumanLungRight.asset.meta | 0 .../HumanStomach.asset | 0 .../HumanStomach.asset.meta | 0 .../HumanTorso.asset | 0 .../HumanTorso.asset.meta | 0 .../IDCard.asset | 0 .../IDCard.asset.meta | 0 .../JukeboxBlueGreen.asset | 0 .../JukeboxBlueGreen.asset.meta | 0 .../JumpsuitBotany.asset | 0 .../JumpsuitBotany.asset.meta | 0 .../JumpsuitEngineer.asset | 0 .../JumpsuitEngineer.asset.meta | 0 .../JumpsuitGrey.asset | 0 .../JumpsuitGrey.asset.meta | 0 .../JumpsuitSecurity.asset | 0 .../JumpsuitSecurity.asset.meta | 0 .../KitchenKnife.asset | 0 .../KitchenKnife.asset.meta | 0 .../Lattice.asset | 0 .../Lattice.asset.meta | 0 .../LightBulbFixture.asset | 0 .../LightBulbFixture.asset.meta | 0 .../LightSwitch.asset | 0 .../LightSwitch.asset.meta | 0 .../LightTubeFixture.asset | 0 .../LightTubeFixture.asset.meta | 0 .../LoadingBar.asset | 0 .../LoadingBar.asset.meta | 0 .../Locker.asset | 0 .../Locker.asset.meta | 0 .../LockerSecure.asset | 0 .../LockerSecure.asset.meta | 0 .../MachineFrame.asset | 0 .../MachineFrame.asset.meta | 0 .../MatterBin.asset | 0 .../MatterBin.asset.meta | 0 .../MedicalPatch.asset | 0 .../MedicalPatch.asset.meta | 0 .../Medkit.asset | 0 .../Medkit.asset.meta | 0 .../MicroLaser.asset | 0 .../MicroLaser.asset.meta | 0 .../Microwave.asset | 0 .../Microwave.asset.meta | 0 .../Mirror.asset | 0 .../Mirror.asset.meta | 0 .../Mug.asset | 0 .../Mug.asset.meta | 0 .../Multitool.asset | 0 .../Multitool.asset.meta | 0 .../NuclearAuthenticationDisk.asset | 0 .../NuclearAuthenticationDisk.asset.meta | 0 .../NukeCart.asset | 0 .../NukeCart.asset.meta | 0 .../OfficeChair.asset | 0 .../OfficeChair.asset.meta | 0 .../OfficeChairBlue.asset | 0 .../OfficeChairBlue.asset.meta | 0 .../OfficeChairGrey.asset | 0 .../OfficeChairGrey.asset.meta | 0 .../OxygenTank.asset | 0 .../OxygenTank.asset.meta | 0 .../PDA.asset | 0 .../PDA.asset.meta | 0 .../PacManGenerator.asset | 0 .../PacManGenerator.asset.meta | 0 .../Plant0.asset | 0 .../Plant0.asset.meta | 0 .../Plant7.asset | 0 .../Plant7.asset.meta | 0 .../PlasmaTank.asset | 0 .../PlasmaTank.asset.meta | 0 .../PlasticChair.asset | 0 .../PlasticChair.asset.meta | 0 .../PlasticChairBlue.asset | 0 .../PlasticChairBlue.asset.meta | 0 .../PlasticChairGrey.asset | 0 .../PlasticChairGrey.asset.meta | 0 .../Plenum.asset | 0 .../Plenum.asset.meta | 0 .../Poster.asset | 0 .../Poster.asset.meta | 0 .../PosterHorizontal.asset | 0 .../PosterHorizontal.asset.meta | 0 .../PosterVertical.asset | 0 .../PosterVertical.asset.meta | 0 .../PowerCell.asset | 0 .../PowerCell.asset.meta | 0 .../PowerCellAdmin.asset | 0 .../PowerCellAdmin.asset.meta | 0 .../PowerCellCharger.asset | 0 .../PowerCellCharger.asset.meta | 0 .../SMES.asset | 0 .../SMES.asset.meta | 0 .../ScrewdriverBlue.asset | 0 .../ScrewdriverBlue.asset.meta | 0 .../Scrubber.asset | 0 .../Scrubber.asset.meta | 0 .../SecurityAirlock.asset | 0 .../SecurityAirlock.asset.meta | 0 .../SecurityIDCard.asset | 0 .../SecurityIDCard.asset.meta | 0 .../SecurityLocker.asset | 0 .../SecurityLocker.asset.meta | 0 .../SecurityPDA.asset | 0 .../SecurityPDA.asset.meta | 0 .../ShoeHiTops.asset | 0 .../ShoeHiTops.asset.meta | 0 .../ShoeJackboots.asset | 0 .../ShoeJackboots.asset.meta | 0 .../Sink.asset | 0 .../Sink.asset.meta | 0 .../SleeperBed.asset | 0 .../SleeperBed.asset.meta | 0 .../SlotMachine.asset | 0 .../SlotMachine.asset.meta | 0 .../SodaCanBeepsSoda.asset | 0 .../SodaCanBeepsSoda.asset.meta | 0 .../SodaCanBeepyLime.asset | 0 .../SodaCanBeepyLime.asset.meta | 0 .../SodaCanCannedAir.asset | 0 .../SodaCanCannedAir.asset.meta | 0 .../SodaCanCannedLaughter.asset | 0 .../SodaCanCannedLaughter.asset.meta | 0 .../SodaCanCola.asset | 0 .../SodaCanCola.asset.meta | 0 .../SodaCanDukePurpleTea.asset | 0 .../SodaCanDukePurpleTea.asset.meta | 0 .../SodaCanTonic.asset | 0 .../SodaCanTonic.asset.meta | 0 .../SolarPanel.asset | 0 .../SolarPanel.asset.meta | 0 .../SolarTrackingBeacon.asset | 0 .../SolarTrackingBeacon.asset.meta | 0 .../SteelGirder.asset | 0 .../SteelGirder.asset.meta | 0 .../SteelGirderUnbolted.asset | 0 .../SteelGirderUnbolted.asset.meta | 0 .../SteelReinforcedSheet.asset | 0 .../SteelReinforcedSheet.asset.meta | 0 .../SteelRod.asset | 0 .../SteelRod.asset.meta | 0 .../SteelSheet.asset | 0 .../SteelSheet.asset.meta | 0 .../SteelWall.asset | 0 .../SteelWall.asset.meta | 0 .../SteelWallReinforced.asset | 0 .../SteelWallReinforced.asset.meta | 0 .../SteelWindow.asset | 0 .../SteelWindow.asset.meta | 0 .../SteelWindowReinforced.asset | 0 .../SteelWindowReinforced.asset.meta | 0 .../Sunglasses.asset | 0 .../Sunglasses.asset.meta | 0 .../TableBoozeDispenser.asset | 0 .../TableBoozeDispenser.asset.meta | 0 .../TableFrameSteel.asset | 0 .../TableFrameSteel.asset.meta | 0 .../TableFrameWood.asset | 0 .../TableFrameWood.asset.meta | 0 .../TableGlass.asset | 0 .../TableGlass.asset.meta | 0 .../TablePoker.asset | 0 .../TablePoker.asset.meta | 0 .../TableSteel.asset | 0 .../TableSteel.asset.meta | 0 .../TableWood.asset | 0 .../TableWood.asset.meta | 0 .../TileBar.asset | 0 .../TileBar.asset.meta | 0 .../TileDirt1.asset | 0 .../TileDirt1.asset.meta | 0 .../TileGrass.asset | 0 .../TileGrass.asset.meta | 0 .../TileGrey.asset | 0 .../TileGrey.asset.meta | 0 .../TileGreyDark.asset | 0 .../TileGreyDark.asset.meta | 0 .../TileKitchen.asset | 0 .../TileKitchen.asset.meta | 0 .../TileOverlayBlue.asset | 0 .../TileOverlayBlue.asset.meta | 0 .../TileOverlayBrown.asset | 0 .../TileOverlayBrown.asset.meta | 0 .../TileOverlayGreen.asset | 0 .../TileOverlayGreen.asset.meta | 0 .../TileOverlayOrange.asset | 0 .../TileOverlayOrange.asset.meta | 0 .../TileOverlayPurple.asset | 0 .../TileOverlayPurple.asset.meta | 0 .../TileOverlayRed.asset | 0 .../TileOverlayRed.asset.meta | 0 .../TilePlating.asset | 0 .../TilePlating.asset.meta | 0 .../TileReinforced.asset | 0 .../TileReinforced.asset.meta | 0 .../TileWhite.asset | 0 .../TileWhite.asset.meta | 0 .../TileWood.asset | 0 .../TileWood.asset.meta | 0 .../Title1.asset | 0 .../Title1.asset.meta | 0 .../Title2.asset | 0 .../Title2.asset.meta | 0 .../Title3.asset | 0 .../Title3.asset.meta | 0 .../Toolbelt.asset | 0 .../Toolbelt.asset.meta | 0 .../ToolboxBlue.asset | 0 .../ToolboxBlue.asset.meta | 0 .../TruckerCap.asset | 0 .../TruckerCap.asset.meta | 0 .../VendorHotDrinks.asset | 0 .../VendorHotDrinks.asset.meta | 0 .../VendorRobustSoftdrinks.asset | 0 .../VendorRobustSoftdrinks.asset.meta | 0 .../VendorSecTech.asset | 0 .../VendorSecTech.asset.meta | 0 .../VendorYouTool.asset | 0 .../VendorYouTool.asset.meta | 0 .../Vent.asset | 0 .../Vent.asset.meta | 0 .../WaterCooler.asset | 0 .../WaterCooler.asset.meta | 0 .../WaterTank.asset | 0 .../WaterTank.asset.meta | 0 .../Welder.asset | 0 .../Welder.asset.meta | 0 .../Wirecutters.asset | 0 .../Wirecutters.asset.meta | 0 .../WoodLog.asset | 0 .../WoodLog.asset.meta | 0 .../WoodPlank.asset | 0 .../WoodPlank.asset.meta | 0 .../Wrench.asset | 0 .../Wrench.asset.meta | 0 .../SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs | 2 +- 372 files changed, 1 insertion(+), 1 deletion(-) rename Assets/Content/Data/{WorldObjectAssetReferences.meta => ObjectAssetReferences.meta} (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/APC.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/APC.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AirAlarm.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AirAlarm.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AtmosPipesL1.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AtmosPipesL1.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AtmosPipesL2.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AtmosPipesL2.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AtmosPipesL3.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AtmosPipesL3.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AtmosPipesL4.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AtmosPipesL4.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AttackParticles.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/AttackParticles.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Backpack.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Backpack.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/BikeHorn.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/BikeHorn.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/BleedingParticle.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/BleedingParticle.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Blender.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Blender.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Boombox.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Boombox.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/BrutePatch.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/BrutePatch.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/BurnPatch.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/BurnPatch.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Cables.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Cables.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Can1.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Can1.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Can2.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Can2.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Can3.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Can3.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Can4.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Can4.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Catwalk.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Catwalk.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ChemicalDispenser.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ChemicalDispenser.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/CivillianAirlock.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/CivillianAirlock.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ConstructionParticle.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ConstructionParticle.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Crowbar.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Crowbar.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Cryotube.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Cryotube.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DinnerBooth.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DinnerBooth.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DisposalBin.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DisposalBin.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DisposalOutlet.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DisposalOutlet.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DisposalPipes.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DisposalPipes.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DonkPocket.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/DonkPocket.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Doodad.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Doodad.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ElectricalCable.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ElectricalCable.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ElectricalWire.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ElectricalWire.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FacewearGasMask.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FacewearGasMask.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FancyCarpetRed.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FancyCarpetRed.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FireAlarm.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FireAlarm.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FlashlightBlue.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FlashlightBlue.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FloorTile.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FloorTile.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FuelTank.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/FuelTank.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Gibber.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Gibber.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/GlassReinforcedSheet.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/GlassReinforcedSheet.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/GlassShard.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/GlassShard.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/GlassSheet.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/GlassSheet.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/GloveInsulated.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/GloveInsulated.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Hatchet.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Hatchet.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Headset.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Headset.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HeadsetSecurity.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HeadsetSecurity.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HealthScanner.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HealthScanner.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanArmLeft.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanArmLeft.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanArmRight.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanArmRight.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanBrain.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanBrain.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanEarLeft.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanEarLeft.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanEarRight.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanEarRight.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanEye.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanEye.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanFootLeft.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanFootLeft.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanFootRight.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanFootRight.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanHandLeft.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanHandLeft.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanHandRight.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanHandRight.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanHead.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanHead.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanHeart.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanHeart.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanIntestineLarge.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanIntestineLarge.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanIntestineSmall.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanIntestineSmall.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLegLeft.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLegLeft.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLegRight.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLegRight.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLiver.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLiver.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLungLeft.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLungLeft.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLungRight.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanLungRight.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanStomach.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanStomach.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanTorso.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/HumanTorso.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/IDCard.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/IDCard.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JukeboxBlueGreen.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JukeboxBlueGreen.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JumpsuitBotany.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JumpsuitBotany.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JumpsuitEngineer.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JumpsuitEngineer.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JumpsuitGrey.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JumpsuitGrey.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JumpsuitSecurity.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/JumpsuitSecurity.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/KitchenKnife.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/KitchenKnife.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Lattice.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Lattice.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LightBulbFixture.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LightBulbFixture.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LightSwitch.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LightSwitch.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LightTubeFixture.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LightTubeFixture.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LoadingBar.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LoadingBar.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Locker.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Locker.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LockerSecure.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/LockerSecure.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/MachineFrame.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/MachineFrame.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/MatterBin.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/MatterBin.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/MedicalPatch.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/MedicalPatch.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Medkit.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Medkit.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/MicroLaser.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/MicroLaser.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Microwave.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Microwave.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Mirror.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Mirror.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Mug.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Mug.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Multitool.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Multitool.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/NuclearAuthenticationDisk.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/NuclearAuthenticationDisk.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/NukeCart.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/NukeCart.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/OfficeChair.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/OfficeChair.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/OfficeChairBlue.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/OfficeChairBlue.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/OfficeChairGrey.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/OfficeChairGrey.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/OxygenTank.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/OxygenTank.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PDA.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PDA.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PacManGenerator.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PacManGenerator.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Plant0.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Plant0.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Plant7.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Plant7.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PlasmaTank.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PlasmaTank.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PlasticChair.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PlasticChair.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PlasticChairBlue.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PlasticChairBlue.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PlasticChairGrey.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PlasticChairGrey.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Plenum.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Plenum.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Poster.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Poster.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PosterHorizontal.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PosterHorizontal.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PosterVertical.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PosterVertical.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PowerCell.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PowerCell.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PowerCellAdmin.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PowerCellAdmin.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PowerCellCharger.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/PowerCellCharger.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SMES.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SMES.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ScrewdriverBlue.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ScrewdriverBlue.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Scrubber.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Scrubber.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SecurityAirlock.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SecurityAirlock.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SecurityIDCard.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SecurityIDCard.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SecurityLocker.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SecurityLocker.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SecurityPDA.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SecurityPDA.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ShoeHiTops.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ShoeHiTops.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ShoeJackboots.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ShoeJackboots.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Sink.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Sink.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SleeperBed.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SleeperBed.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SlotMachine.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SlotMachine.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanBeepsSoda.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanBeepsSoda.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanBeepyLime.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanBeepyLime.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanCannedAir.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanCannedAir.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanCannedLaughter.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanCannedLaughter.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanCola.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanCola.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanDukePurpleTea.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanDukePurpleTea.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanTonic.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SodaCanTonic.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SolarPanel.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SolarPanel.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SolarTrackingBeacon.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SolarTrackingBeacon.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelGirder.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelGirder.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelGirderUnbolted.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelGirderUnbolted.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelReinforcedSheet.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelReinforcedSheet.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelRod.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelRod.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelSheet.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelSheet.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelWall.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelWall.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelWallReinforced.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelWallReinforced.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelWindow.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelWindow.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelWindowReinforced.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/SteelWindowReinforced.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Sunglasses.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Sunglasses.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableBoozeDispenser.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableBoozeDispenser.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableFrameSteel.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableFrameSteel.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableFrameWood.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableFrameWood.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableGlass.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableGlass.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TablePoker.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TablePoker.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableSteel.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableSteel.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableWood.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TableWood.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileBar.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileBar.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileDirt1.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileDirt1.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileGrass.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileGrass.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileGrey.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileGrey.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileGreyDark.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileGreyDark.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileKitchen.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileKitchen.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayBlue.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayBlue.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayBrown.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayBrown.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayGreen.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayGreen.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayOrange.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayOrange.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayPurple.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayPurple.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayRed.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileOverlayRed.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TilePlating.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TilePlating.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileReinforced.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileReinforced.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileWhite.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileWhite.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileWood.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TileWood.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Title1.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Title1.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Title2.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Title2.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Title3.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Title3.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Toolbelt.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Toolbelt.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ToolboxBlue.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/ToolboxBlue.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TruckerCap.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/TruckerCap.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/VendorHotDrinks.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/VendorHotDrinks.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/VendorRobustSoftdrinks.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/VendorRobustSoftdrinks.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/VendorSecTech.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/VendorSecTech.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/VendorYouTool.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/VendorYouTool.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Vent.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Vent.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/WaterCooler.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/WaterCooler.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/WaterTank.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/WaterTank.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Welder.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Welder.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Wirecutters.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Wirecutters.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/WoodLog.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/WoodLog.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/WoodPlank.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/WoodPlank.asset.meta (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Wrench.asset (100%) rename Assets/Content/Data/{WorldObjectAssetReferences => ObjectAssetReferences}/Wrench.asset.meta (100%) diff --git a/Assets/Content/Data/WorldObjectAssetReferences.meta b/Assets/Content/Data/ObjectAssetReferences.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences.meta rename to Assets/Content/Data/ObjectAssetReferences.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/APC.asset b/Assets/Content/Data/ObjectAssetReferences/APC.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/APC.asset rename to Assets/Content/Data/ObjectAssetReferences/APC.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta b/Assets/Content/Data/ObjectAssetReferences/APC.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/APC.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/APC.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset b/Assets/Content/Data/ObjectAssetReferences/AirAlarm.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset rename to Assets/Content/Data/ObjectAssetReferences/AirAlarm.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta b/Assets/Content/Data/ObjectAssetReferences/AirAlarm.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AirAlarm.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/AirAlarm.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset b/Assets/Content/Data/ObjectAssetReferences/AtmosPipesL1.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset rename to Assets/Content/Data/ObjectAssetReferences/AtmosPipesL1.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta b/Assets/Content/Data/ObjectAssetReferences/AtmosPipesL1.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL1.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/AtmosPipesL1.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset b/Assets/Content/Data/ObjectAssetReferences/AtmosPipesL2.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset rename to Assets/Content/Data/ObjectAssetReferences/AtmosPipesL2.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta b/Assets/Content/Data/ObjectAssetReferences/AtmosPipesL2.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL2.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/AtmosPipesL2.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset b/Assets/Content/Data/ObjectAssetReferences/AtmosPipesL3.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset rename to Assets/Content/Data/ObjectAssetReferences/AtmosPipesL3.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta b/Assets/Content/Data/ObjectAssetReferences/AtmosPipesL3.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL3.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/AtmosPipesL3.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset b/Assets/Content/Data/ObjectAssetReferences/AtmosPipesL4.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset rename to Assets/Content/Data/ObjectAssetReferences/AtmosPipesL4.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta b/Assets/Content/Data/ObjectAssetReferences/AtmosPipesL4.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AtmosPipesL4.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/AtmosPipesL4.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset b/Assets/Content/Data/ObjectAssetReferences/AttackParticles.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset rename to Assets/Content/Data/ObjectAssetReferences/AttackParticles.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset.meta b/Assets/Content/Data/ObjectAssetReferences/AttackParticles.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/AttackParticles.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/AttackParticles.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset b/Assets/Content/Data/ObjectAssetReferences/Backpack.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset rename to Assets/Content/Data/ObjectAssetReferences/Backpack.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Backpack.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Backpack.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Backpack.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset b/Assets/Content/Data/ObjectAssetReferences/BikeHorn.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset rename to Assets/Content/Data/ObjectAssetReferences/BikeHorn.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset.meta b/Assets/Content/Data/ObjectAssetReferences/BikeHorn.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/BikeHorn.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/BikeHorn.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset b/Assets/Content/Data/ObjectAssetReferences/BleedingParticle.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset rename to Assets/Content/Data/ObjectAssetReferences/BleedingParticle.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset.meta b/Assets/Content/Data/ObjectAssetReferences/BleedingParticle.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/BleedingParticle.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/BleedingParticle.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset b/Assets/Content/Data/ObjectAssetReferences/Blender.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Blender.asset rename to Assets/Content/Data/ObjectAssetReferences/Blender.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Blender.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Blender.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Blender.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset b/Assets/Content/Data/ObjectAssetReferences/Boombox.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset rename to Assets/Content/Data/ObjectAssetReferences/Boombox.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Boombox.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Boombox.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Boombox.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset b/Assets/Content/Data/ObjectAssetReferences/BrutePatch.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset rename to Assets/Content/Data/ObjectAssetReferences/BrutePatch.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset.meta b/Assets/Content/Data/ObjectAssetReferences/BrutePatch.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/BrutePatch.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/BrutePatch.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset b/Assets/Content/Data/ObjectAssetReferences/BurnPatch.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset rename to Assets/Content/Data/ObjectAssetReferences/BurnPatch.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset.meta b/Assets/Content/Data/ObjectAssetReferences/BurnPatch.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/BurnPatch.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/BurnPatch.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset b/Assets/Content/Data/ObjectAssetReferences/Cables.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Cables.asset rename to Assets/Content/Data/ObjectAssetReferences/Cables.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Cables.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Cables.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Cables.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset b/Assets/Content/Data/ObjectAssetReferences/Can1.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Can1.asset rename to Assets/Content/Data/ObjectAssetReferences/Can1.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Can1.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Can1.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Can1.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset b/Assets/Content/Data/ObjectAssetReferences/Can2.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Can2.asset rename to Assets/Content/Data/ObjectAssetReferences/Can2.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Can2.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Can2.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Can2.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset b/Assets/Content/Data/ObjectAssetReferences/Can3.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Can3.asset rename to Assets/Content/Data/ObjectAssetReferences/Can3.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Can3.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Can3.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Can3.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset b/Assets/Content/Data/ObjectAssetReferences/Can4.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Can4.asset rename to Assets/Content/Data/ObjectAssetReferences/Can4.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Can4.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Can4.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Can4.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset b/Assets/Content/Data/ObjectAssetReferences/Catwalk.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset rename to Assets/Content/Data/ObjectAssetReferences/Catwalk.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Catwalk.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Catwalk.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Catwalk.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset b/Assets/Content/Data/ObjectAssetReferences/ChemicalDispenser.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset rename to Assets/Content/Data/ObjectAssetReferences/ChemicalDispenser.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta b/Assets/Content/Data/ObjectAssetReferences/ChemicalDispenser.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ChemicalDispenser.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/ChemicalDispenser.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset b/Assets/Content/Data/ObjectAssetReferences/CivillianAirlock.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset rename to Assets/Content/Data/ObjectAssetReferences/CivillianAirlock.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta b/Assets/Content/Data/ObjectAssetReferences/CivillianAirlock.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/CivillianAirlock.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/CivillianAirlock.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset b/Assets/Content/Data/ObjectAssetReferences/ConstructionParticle.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset rename to Assets/Content/Data/ObjectAssetReferences/ConstructionParticle.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset.meta b/Assets/Content/Data/ObjectAssetReferences/ConstructionParticle.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ConstructionParticle.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/ConstructionParticle.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset b/Assets/Content/Data/ObjectAssetReferences/Crowbar.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset rename to Assets/Content/Data/ObjectAssetReferences/Crowbar.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Crowbar.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Crowbar.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Crowbar.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset b/Assets/Content/Data/ObjectAssetReferences/Cryotube.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset rename to Assets/Content/Data/ObjectAssetReferences/Cryotube.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Cryotube.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Cryotube.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Cryotube.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset b/Assets/Content/Data/ObjectAssetReferences/DinnerBooth.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset rename to Assets/Content/Data/ObjectAssetReferences/DinnerBooth.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta b/Assets/Content/Data/ObjectAssetReferences/DinnerBooth.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DinnerBooth.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/DinnerBooth.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset b/Assets/Content/Data/ObjectAssetReferences/DisposalBin.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset rename to Assets/Content/Data/ObjectAssetReferences/DisposalBin.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta b/Assets/Content/Data/ObjectAssetReferences/DisposalBin.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DisposalBin.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/DisposalBin.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset b/Assets/Content/Data/ObjectAssetReferences/DisposalOutlet.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset rename to Assets/Content/Data/ObjectAssetReferences/DisposalOutlet.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta b/Assets/Content/Data/ObjectAssetReferences/DisposalOutlet.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DisposalOutlet.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/DisposalOutlet.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset b/Assets/Content/Data/ObjectAssetReferences/DisposalPipes.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset rename to Assets/Content/Data/ObjectAssetReferences/DisposalPipes.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta b/Assets/Content/Data/ObjectAssetReferences/DisposalPipes.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DisposalPipes.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/DisposalPipes.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset b/Assets/Content/Data/ObjectAssetReferences/DonkPocket.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset rename to Assets/Content/Data/ObjectAssetReferences/DonkPocket.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset.meta b/Assets/Content/Data/ObjectAssetReferences/DonkPocket.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/DonkPocket.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/DonkPocket.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset b/Assets/Content/Data/ObjectAssetReferences/Doodad.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset rename to Assets/Content/Data/ObjectAssetReferences/Doodad.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Doodad.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Doodad.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Doodad.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset b/Assets/Content/Data/ObjectAssetReferences/ElectricalCable.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset rename to Assets/Content/Data/ObjectAssetReferences/ElectricalCable.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset.meta b/Assets/Content/Data/ObjectAssetReferences/ElectricalCable.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ElectricalCable.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/ElectricalCable.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset b/Assets/Content/Data/ObjectAssetReferences/ElectricalWire.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset rename to Assets/Content/Data/ObjectAssetReferences/ElectricalWire.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset.meta b/Assets/Content/Data/ObjectAssetReferences/ElectricalWire.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ElectricalWire.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/ElectricalWire.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset b/Assets/Content/Data/ObjectAssetReferences/FacewearGasMask.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset rename to Assets/Content/Data/ObjectAssetReferences/FacewearGasMask.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset.meta b/Assets/Content/Data/ObjectAssetReferences/FacewearGasMask.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FacewearGasMask.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/FacewearGasMask.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset b/Assets/Content/Data/ObjectAssetReferences/FancyCarpetRed.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset rename to Assets/Content/Data/ObjectAssetReferences/FancyCarpetRed.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta b/Assets/Content/Data/ObjectAssetReferences/FancyCarpetRed.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FancyCarpetRed.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/FancyCarpetRed.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset b/Assets/Content/Data/ObjectAssetReferences/FireAlarm.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset rename to Assets/Content/Data/ObjectAssetReferences/FireAlarm.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta b/Assets/Content/Data/ObjectAssetReferences/FireAlarm.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FireAlarm.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/FireAlarm.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset b/Assets/Content/Data/ObjectAssetReferences/FlashlightBlue.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset rename to Assets/Content/Data/ObjectAssetReferences/FlashlightBlue.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset.meta b/Assets/Content/Data/ObjectAssetReferences/FlashlightBlue.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FlashlightBlue.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/FlashlightBlue.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset b/Assets/Content/Data/ObjectAssetReferences/FloorTile.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset rename to Assets/Content/Data/ObjectAssetReferences/FloorTile.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset.meta b/Assets/Content/Data/ObjectAssetReferences/FloorTile.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FloorTile.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/FloorTile.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset b/Assets/Content/Data/ObjectAssetReferences/FuelTank.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset rename to Assets/Content/Data/ObjectAssetReferences/FuelTank.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta b/Assets/Content/Data/ObjectAssetReferences/FuelTank.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/FuelTank.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/FuelTank.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset b/Assets/Content/Data/ObjectAssetReferences/Gibber.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset rename to Assets/Content/Data/ObjectAssetReferences/Gibber.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Gibber.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Gibber.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Gibber.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset b/Assets/Content/Data/ObjectAssetReferences/GlassReinforcedSheet.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset rename to Assets/Content/Data/ObjectAssetReferences/GlassReinforcedSheet.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset.meta b/Assets/Content/Data/ObjectAssetReferences/GlassReinforcedSheet.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/GlassReinforcedSheet.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/GlassReinforcedSheet.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset b/Assets/Content/Data/ObjectAssetReferences/GlassShard.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset rename to Assets/Content/Data/ObjectAssetReferences/GlassShard.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset.meta b/Assets/Content/Data/ObjectAssetReferences/GlassShard.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/GlassShard.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/GlassShard.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset b/Assets/Content/Data/ObjectAssetReferences/GlassSheet.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset rename to Assets/Content/Data/ObjectAssetReferences/GlassSheet.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset.meta b/Assets/Content/Data/ObjectAssetReferences/GlassSheet.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/GlassSheet.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/GlassSheet.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset b/Assets/Content/Data/ObjectAssetReferences/GloveInsulated.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset rename to Assets/Content/Data/ObjectAssetReferences/GloveInsulated.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset.meta b/Assets/Content/Data/ObjectAssetReferences/GloveInsulated.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/GloveInsulated.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/GloveInsulated.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset b/Assets/Content/Data/ObjectAssetReferences/Hatchet.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset rename to Assets/Content/Data/ObjectAssetReferences/Hatchet.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Hatchet.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Hatchet.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Hatchet.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset b/Assets/Content/Data/ObjectAssetReferences/Headset.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Headset.asset rename to Assets/Content/Data/ObjectAssetReferences/Headset.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Headset.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Headset.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Headset.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Headset.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset b/Assets/Content/Data/ObjectAssetReferences/HeadsetSecurity.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset rename to Assets/Content/Data/ObjectAssetReferences/HeadsetSecurity.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HeadsetSecurity.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HeadsetSecurity.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HeadsetSecurity.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset b/Assets/Content/Data/ObjectAssetReferences/HealthScanner.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset rename to Assets/Content/Data/ObjectAssetReferences/HealthScanner.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HealthScanner.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HealthScanner.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HealthScanner.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset b/Assets/Content/Data/ObjectAssetReferences/HumanArmLeft.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanArmLeft.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanArmLeft.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanArmLeft.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanArmLeft.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset b/Assets/Content/Data/ObjectAssetReferences/HumanArmRight.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanArmRight.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanArmRight.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanArmRight.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanArmRight.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset b/Assets/Content/Data/ObjectAssetReferences/HumanBrain.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanBrain.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanBrain.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanBrain.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanBrain.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset b/Assets/Content/Data/ObjectAssetReferences/HumanEarLeft.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanEarLeft.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanEarLeft.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanEarLeft.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanEarLeft.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset b/Assets/Content/Data/ObjectAssetReferences/HumanEarRight.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanEarRight.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanEarRight.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanEarRight.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanEarRight.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset b/Assets/Content/Data/ObjectAssetReferences/HumanEye.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanEye.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanEye.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanEye.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanEye.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset b/Assets/Content/Data/ObjectAssetReferences/HumanFootLeft.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanFootLeft.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanFootLeft.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanFootLeft.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanFootLeft.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset b/Assets/Content/Data/ObjectAssetReferences/HumanFootRight.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanFootRight.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanFootRight.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanFootRight.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanFootRight.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset b/Assets/Content/Data/ObjectAssetReferences/HumanHandLeft.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanHandLeft.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanHandLeft.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanHandLeft.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanHandLeft.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset b/Assets/Content/Data/ObjectAssetReferences/HumanHandRight.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanHandRight.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanHandRight.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanHandRight.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanHandRight.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset b/Assets/Content/Data/ObjectAssetReferences/HumanHead.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanHead.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanHead.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanHead.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanHead.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset b/Assets/Content/Data/ObjectAssetReferences/HumanHeart.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanHeart.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanHeart.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanHeart.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanHeart.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset b/Assets/Content/Data/ObjectAssetReferences/HumanIntestineLarge.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanIntestineLarge.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanIntestineLarge.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineLarge.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanIntestineLarge.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset b/Assets/Content/Data/ObjectAssetReferences/HumanIntestineSmall.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanIntestineSmall.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanIntestineSmall.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanIntestineSmall.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanIntestineSmall.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset b/Assets/Content/Data/ObjectAssetReferences/HumanLegLeft.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanLegLeft.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanLegLeft.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLegLeft.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanLegLeft.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset b/Assets/Content/Data/ObjectAssetReferences/HumanLegRight.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanLegRight.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanLegRight.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLegRight.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanLegRight.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset b/Assets/Content/Data/ObjectAssetReferences/HumanLiver.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanLiver.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanLiver.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLiver.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanLiver.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset b/Assets/Content/Data/ObjectAssetReferences/HumanLungLeft.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanLungLeft.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanLungLeft.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLungLeft.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanLungLeft.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset b/Assets/Content/Data/ObjectAssetReferences/HumanLungRight.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanLungRight.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanLungRight.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanLungRight.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanLungRight.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset b/Assets/Content/Data/ObjectAssetReferences/HumanStomach.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanStomach.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanStomach.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanStomach.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanStomach.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset b/Assets/Content/Data/ObjectAssetReferences/HumanTorso.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset rename to Assets/Content/Data/ObjectAssetReferences/HumanTorso.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset.meta b/Assets/Content/Data/ObjectAssetReferences/HumanTorso.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/HumanTorso.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/HumanTorso.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset b/Assets/Content/Data/ObjectAssetReferences/IDCard.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset rename to Assets/Content/Data/ObjectAssetReferences/IDCard.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset.meta b/Assets/Content/Data/ObjectAssetReferences/IDCard.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/IDCard.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/IDCard.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset b/Assets/Content/Data/ObjectAssetReferences/JukeboxBlueGreen.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset rename to Assets/Content/Data/ObjectAssetReferences/JukeboxBlueGreen.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta b/Assets/Content/Data/ObjectAssetReferences/JukeboxBlueGreen.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JukeboxBlueGreen.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/JukeboxBlueGreen.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset b/Assets/Content/Data/ObjectAssetReferences/JumpsuitBotany.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset rename to Assets/Content/Data/ObjectAssetReferences/JumpsuitBotany.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset.meta b/Assets/Content/Data/ObjectAssetReferences/JumpsuitBotany.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JumpsuitBotany.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/JumpsuitBotany.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset b/Assets/Content/Data/ObjectAssetReferences/JumpsuitEngineer.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset rename to Assets/Content/Data/ObjectAssetReferences/JumpsuitEngineer.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset.meta b/Assets/Content/Data/ObjectAssetReferences/JumpsuitEngineer.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JumpsuitEngineer.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/JumpsuitEngineer.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset b/Assets/Content/Data/ObjectAssetReferences/JumpsuitGrey.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset rename to Assets/Content/Data/ObjectAssetReferences/JumpsuitGrey.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset.meta b/Assets/Content/Data/ObjectAssetReferences/JumpsuitGrey.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JumpsuitGrey.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/JumpsuitGrey.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset b/Assets/Content/Data/ObjectAssetReferences/JumpsuitSecurity.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset rename to Assets/Content/Data/ObjectAssetReferences/JumpsuitSecurity.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset.meta b/Assets/Content/Data/ObjectAssetReferences/JumpsuitSecurity.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/JumpsuitSecurity.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/JumpsuitSecurity.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset b/Assets/Content/Data/ObjectAssetReferences/KitchenKnife.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset rename to Assets/Content/Data/ObjectAssetReferences/KitchenKnife.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset.meta b/Assets/Content/Data/ObjectAssetReferences/KitchenKnife.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/KitchenKnife.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/KitchenKnife.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset b/Assets/Content/Data/ObjectAssetReferences/Lattice.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset rename to Assets/Content/Data/ObjectAssetReferences/Lattice.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Lattice.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Lattice.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Lattice.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset b/Assets/Content/Data/ObjectAssetReferences/LightBulbFixture.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset rename to Assets/Content/Data/ObjectAssetReferences/LightBulbFixture.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta b/Assets/Content/Data/ObjectAssetReferences/LightBulbFixture.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LightBulbFixture.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/LightBulbFixture.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset b/Assets/Content/Data/ObjectAssetReferences/LightSwitch.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset rename to Assets/Content/Data/ObjectAssetReferences/LightSwitch.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta b/Assets/Content/Data/ObjectAssetReferences/LightSwitch.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LightSwitch.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/LightSwitch.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset b/Assets/Content/Data/ObjectAssetReferences/LightTubeFixture.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset rename to Assets/Content/Data/ObjectAssetReferences/LightTubeFixture.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta b/Assets/Content/Data/ObjectAssetReferences/LightTubeFixture.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LightTubeFixture.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/LightTubeFixture.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset b/Assets/Content/Data/ObjectAssetReferences/LoadingBar.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset rename to Assets/Content/Data/ObjectAssetReferences/LoadingBar.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset.meta b/Assets/Content/Data/ObjectAssetReferences/LoadingBar.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LoadingBar.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/LoadingBar.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset b/Assets/Content/Data/ObjectAssetReferences/Locker.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Locker.asset rename to Assets/Content/Data/ObjectAssetReferences/Locker.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Locker.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Locker.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Locker.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset b/Assets/Content/Data/ObjectAssetReferences/LockerSecure.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset rename to Assets/Content/Data/ObjectAssetReferences/LockerSecure.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta b/Assets/Content/Data/ObjectAssetReferences/LockerSecure.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/LockerSecure.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/LockerSecure.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset b/Assets/Content/Data/ObjectAssetReferences/MachineFrame.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset rename to Assets/Content/Data/ObjectAssetReferences/MachineFrame.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta b/Assets/Content/Data/ObjectAssetReferences/MachineFrame.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/MachineFrame.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/MachineFrame.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset b/Assets/Content/Data/ObjectAssetReferences/MatterBin.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset rename to Assets/Content/Data/ObjectAssetReferences/MatterBin.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset.meta b/Assets/Content/Data/ObjectAssetReferences/MatterBin.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/MatterBin.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/MatterBin.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset b/Assets/Content/Data/ObjectAssetReferences/MedicalPatch.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset rename to Assets/Content/Data/ObjectAssetReferences/MedicalPatch.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset.meta b/Assets/Content/Data/ObjectAssetReferences/MedicalPatch.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/MedicalPatch.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/MedicalPatch.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset b/Assets/Content/Data/ObjectAssetReferences/Medkit.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset rename to Assets/Content/Data/ObjectAssetReferences/Medkit.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Medkit.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Medkit.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Medkit.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset b/Assets/Content/Data/ObjectAssetReferences/MicroLaser.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset rename to Assets/Content/Data/ObjectAssetReferences/MicroLaser.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset.meta b/Assets/Content/Data/ObjectAssetReferences/MicroLaser.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/MicroLaser.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/MicroLaser.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset b/Assets/Content/Data/ObjectAssetReferences/Microwave.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset rename to Assets/Content/Data/ObjectAssetReferences/Microwave.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Microwave.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Microwave.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Microwave.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset b/Assets/Content/Data/ObjectAssetReferences/Mirror.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset rename to Assets/Content/Data/ObjectAssetReferences/Mirror.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Mirror.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Mirror.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Mirror.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset b/Assets/Content/Data/ObjectAssetReferences/Mug.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Mug.asset rename to Assets/Content/Data/ObjectAssetReferences/Mug.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Mug.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Mug.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Mug.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Mug.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset b/Assets/Content/Data/ObjectAssetReferences/Multitool.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset rename to Assets/Content/Data/ObjectAssetReferences/Multitool.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Multitool.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Multitool.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Multitool.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset b/Assets/Content/Data/ObjectAssetReferences/NuclearAuthenticationDisk.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset rename to Assets/Content/Data/ObjectAssetReferences/NuclearAuthenticationDisk.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset.meta b/Assets/Content/Data/ObjectAssetReferences/NuclearAuthenticationDisk.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/NuclearAuthenticationDisk.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/NuclearAuthenticationDisk.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset b/Assets/Content/Data/ObjectAssetReferences/NukeCart.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset rename to Assets/Content/Data/ObjectAssetReferences/NukeCart.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta b/Assets/Content/Data/ObjectAssetReferences/NukeCart.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/NukeCart.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/NukeCart.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset b/Assets/Content/Data/ObjectAssetReferences/OfficeChair.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset rename to Assets/Content/Data/ObjectAssetReferences/OfficeChair.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta b/Assets/Content/Data/ObjectAssetReferences/OfficeChair.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/OfficeChair.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/OfficeChair.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset b/Assets/Content/Data/ObjectAssetReferences/OfficeChairBlue.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset rename to Assets/Content/Data/ObjectAssetReferences/OfficeChairBlue.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta b/Assets/Content/Data/ObjectAssetReferences/OfficeChairBlue.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/OfficeChairBlue.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/OfficeChairBlue.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset b/Assets/Content/Data/ObjectAssetReferences/OfficeChairGrey.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset rename to Assets/Content/Data/ObjectAssetReferences/OfficeChairGrey.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta b/Assets/Content/Data/ObjectAssetReferences/OfficeChairGrey.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/OfficeChairGrey.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/OfficeChairGrey.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset b/Assets/Content/Data/ObjectAssetReferences/OxygenTank.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset rename to Assets/Content/Data/ObjectAssetReferences/OxygenTank.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset.meta b/Assets/Content/Data/ObjectAssetReferences/OxygenTank.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/OxygenTank.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/OxygenTank.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset b/Assets/Content/Data/ObjectAssetReferences/PDA.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PDA.asset rename to Assets/Content/Data/ObjectAssetReferences/PDA.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PDA.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PDA.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PDA.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PDA.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset b/Assets/Content/Data/ObjectAssetReferences/PacManGenerator.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset rename to Assets/Content/Data/ObjectAssetReferences/PacManGenerator.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PacManGenerator.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PacManGenerator.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PacManGenerator.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset b/Assets/Content/Data/ObjectAssetReferences/Plant0.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset rename to Assets/Content/Data/ObjectAssetReferences/Plant0.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Plant0.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Plant0.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Plant0.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset b/Assets/Content/Data/ObjectAssetReferences/Plant7.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset rename to Assets/Content/Data/ObjectAssetReferences/Plant7.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Plant7.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Plant7.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Plant7.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset b/Assets/Content/Data/ObjectAssetReferences/PlasmaTank.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset rename to Assets/Content/Data/ObjectAssetReferences/PlasmaTank.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PlasmaTank.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PlasmaTank.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PlasmaTank.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset b/Assets/Content/Data/ObjectAssetReferences/PlasticChair.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset rename to Assets/Content/Data/ObjectAssetReferences/PlasticChair.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PlasticChair.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PlasticChair.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PlasticChair.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset b/Assets/Content/Data/ObjectAssetReferences/PlasticChairBlue.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset rename to Assets/Content/Data/ObjectAssetReferences/PlasticChairBlue.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PlasticChairBlue.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PlasticChairBlue.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PlasticChairBlue.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset b/Assets/Content/Data/ObjectAssetReferences/PlasticChairGrey.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset rename to Assets/Content/Data/ObjectAssetReferences/PlasticChairGrey.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PlasticChairGrey.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PlasticChairGrey.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PlasticChairGrey.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset b/Assets/Content/Data/ObjectAssetReferences/Plenum.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset rename to Assets/Content/Data/ObjectAssetReferences/Plenum.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Plenum.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Plenum.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Plenum.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset b/Assets/Content/Data/ObjectAssetReferences/Poster.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Poster.asset rename to Assets/Content/Data/ObjectAssetReferences/Poster.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Poster.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Poster.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Poster.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Poster.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset b/Assets/Content/Data/ObjectAssetReferences/PosterHorizontal.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset rename to Assets/Content/Data/ObjectAssetReferences/PosterHorizontal.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PosterHorizontal.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PosterHorizontal.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PosterHorizontal.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset b/Assets/Content/Data/ObjectAssetReferences/PosterVertical.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset rename to Assets/Content/Data/ObjectAssetReferences/PosterVertical.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PosterVertical.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PosterVertical.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PosterVertical.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset b/Assets/Content/Data/ObjectAssetReferences/PowerCell.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset rename to Assets/Content/Data/ObjectAssetReferences/PowerCell.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PowerCell.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PowerCell.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PowerCell.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset b/Assets/Content/Data/ObjectAssetReferences/PowerCellAdmin.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset rename to Assets/Content/Data/ObjectAssetReferences/PowerCellAdmin.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PowerCellAdmin.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PowerCellAdmin.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PowerCellAdmin.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset b/Assets/Content/Data/ObjectAssetReferences/PowerCellCharger.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset rename to Assets/Content/Data/ObjectAssetReferences/PowerCellCharger.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta b/Assets/Content/Data/ObjectAssetReferences/PowerCellCharger.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/PowerCellCharger.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/PowerCellCharger.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset b/Assets/Content/Data/ObjectAssetReferences/SMES.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SMES.asset rename to Assets/Content/Data/ObjectAssetReferences/SMES.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SMES.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SMES.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SMES.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset b/Assets/Content/Data/ObjectAssetReferences/ScrewdriverBlue.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset rename to Assets/Content/Data/ObjectAssetReferences/ScrewdriverBlue.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset.meta b/Assets/Content/Data/ObjectAssetReferences/ScrewdriverBlue.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ScrewdriverBlue.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/ScrewdriverBlue.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset b/Assets/Content/Data/ObjectAssetReferences/Scrubber.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset rename to Assets/Content/Data/ObjectAssetReferences/Scrubber.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Scrubber.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Scrubber.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Scrubber.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset b/Assets/Content/Data/ObjectAssetReferences/SecurityAirlock.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset rename to Assets/Content/Data/ObjectAssetReferences/SecurityAirlock.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SecurityAirlock.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SecurityAirlock.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SecurityAirlock.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset b/Assets/Content/Data/ObjectAssetReferences/SecurityIDCard.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset rename to Assets/Content/Data/ObjectAssetReferences/SecurityIDCard.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SecurityIDCard.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SecurityIDCard.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SecurityIDCard.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset b/Assets/Content/Data/ObjectAssetReferences/SecurityLocker.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset rename to Assets/Content/Data/ObjectAssetReferences/SecurityLocker.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SecurityLocker.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SecurityLocker.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SecurityLocker.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset b/Assets/Content/Data/ObjectAssetReferences/SecurityPDA.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset rename to Assets/Content/Data/ObjectAssetReferences/SecurityPDA.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SecurityPDA.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SecurityPDA.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SecurityPDA.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset b/Assets/Content/Data/ObjectAssetReferences/ShoeHiTops.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset rename to Assets/Content/Data/ObjectAssetReferences/ShoeHiTops.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset.meta b/Assets/Content/Data/ObjectAssetReferences/ShoeHiTops.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ShoeHiTops.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/ShoeHiTops.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset b/Assets/Content/Data/ObjectAssetReferences/ShoeJackboots.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset rename to Assets/Content/Data/ObjectAssetReferences/ShoeJackboots.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset.meta b/Assets/Content/Data/ObjectAssetReferences/ShoeJackboots.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ShoeJackboots.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/ShoeJackboots.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset b/Assets/Content/Data/ObjectAssetReferences/Sink.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Sink.asset rename to Assets/Content/Data/ObjectAssetReferences/Sink.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Sink.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Sink.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Sink.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset b/Assets/Content/Data/ObjectAssetReferences/SleeperBed.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset rename to Assets/Content/Data/ObjectAssetReferences/SleeperBed.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SleeperBed.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SleeperBed.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SleeperBed.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset b/Assets/Content/Data/ObjectAssetReferences/SlotMachine.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset rename to Assets/Content/Data/ObjectAssetReferences/SlotMachine.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SlotMachine.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SlotMachine.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SlotMachine.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset b/Assets/Content/Data/ObjectAssetReferences/SodaCanBeepsSoda.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset rename to Assets/Content/Data/ObjectAssetReferences/SodaCanBeepsSoda.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SodaCanBeepsSoda.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepsSoda.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SodaCanBeepsSoda.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset b/Assets/Content/Data/ObjectAssetReferences/SodaCanBeepyLime.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset rename to Assets/Content/Data/ObjectAssetReferences/SodaCanBeepyLime.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SodaCanBeepyLime.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanBeepyLime.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SodaCanBeepyLime.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset b/Assets/Content/Data/ObjectAssetReferences/SodaCanCannedAir.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset rename to Assets/Content/Data/ObjectAssetReferences/SodaCanCannedAir.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SodaCanCannedAir.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedAir.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SodaCanCannedAir.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset b/Assets/Content/Data/ObjectAssetReferences/SodaCanCannedLaughter.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset rename to Assets/Content/Data/ObjectAssetReferences/SodaCanCannedLaughter.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SodaCanCannedLaughter.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanCannedLaughter.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SodaCanCannedLaughter.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset b/Assets/Content/Data/ObjectAssetReferences/SodaCanCola.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset rename to Assets/Content/Data/ObjectAssetReferences/SodaCanCola.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SodaCanCola.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanCola.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SodaCanCola.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset b/Assets/Content/Data/ObjectAssetReferences/SodaCanDukePurpleTea.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset rename to Assets/Content/Data/ObjectAssetReferences/SodaCanDukePurpleTea.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SodaCanDukePurpleTea.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanDukePurpleTea.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SodaCanDukePurpleTea.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset b/Assets/Content/Data/ObjectAssetReferences/SodaCanTonic.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset rename to Assets/Content/Data/ObjectAssetReferences/SodaCanTonic.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SodaCanTonic.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SodaCanTonic.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SodaCanTonic.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset b/Assets/Content/Data/ObjectAssetReferences/SolarPanel.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset rename to Assets/Content/Data/ObjectAssetReferences/SolarPanel.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SolarPanel.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SolarPanel.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SolarPanel.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset b/Assets/Content/Data/ObjectAssetReferences/SolarTrackingBeacon.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset rename to Assets/Content/Data/ObjectAssetReferences/SolarTrackingBeacon.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SolarTrackingBeacon.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SolarTrackingBeacon.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SolarTrackingBeacon.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset b/Assets/Content/Data/ObjectAssetReferences/SteelGirder.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset rename to Assets/Content/Data/ObjectAssetReferences/SteelGirder.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SteelGirder.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelGirder.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SteelGirder.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset b/Assets/Content/Data/ObjectAssetReferences/SteelGirderUnbolted.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset rename to Assets/Content/Data/ObjectAssetReferences/SteelGirderUnbolted.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SteelGirderUnbolted.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelGirderUnbolted.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SteelGirderUnbolted.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset b/Assets/Content/Data/ObjectAssetReferences/SteelReinforcedSheet.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset rename to Assets/Content/Data/ObjectAssetReferences/SteelReinforcedSheet.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SteelReinforcedSheet.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelReinforcedSheet.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SteelReinforcedSheet.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset b/Assets/Content/Data/ObjectAssetReferences/SteelRod.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset rename to Assets/Content/Data/ObjectAssetReferences/SteelRod.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SteelRod.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelRod.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SteelRod.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset b/Assets/Content/Data/ObjectAssetReferences/SteelSheet.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset rename to Assets/Content/Data/ObjectAssetReferences/SteelSheet.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SteelSheet.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelSheet.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SteelSheet.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset b/Assets/Content/Data/ObjectAssetReferences/SteelWall.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset rename to Assets/Content/Data/ObjectAssetReferences/SteelWall.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SteelWall.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelWall.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SteelWall.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset b/Assets/Content/Data/ObjectAssetReferences/SteelWallReinforced.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset rename to Assets/Content/Data/ObjectAssetReferences/SteelWallReinforced.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SteelWallReinforced.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelWallReinforced.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SteelWallReinforced.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset b/Assets/Content/Data/ObjectAssetReferences/SteelWindow.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset rename to Assets/Content/Data/ObjectAssetReferences/SteelWindow.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SteelWindow.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelWindow.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SteelWindow.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset b/Assets/Content/Data/ObjectAssetReferences/SteelWindowReinforced.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset rename to Assets/Content/Data/ObjectAssetReferences/SteelWindowReinforced.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset.meta b/Assets/Content/Data/ObjectAssetReferences/SteelWindowReinforced.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/SteelWindowReinforced.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/SteelWindowReinforced.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset b/Assets/Content/Data/ObjectAssetReferences/Sunglasses.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset rename to Assets/Content/Data/ObjectAssetReferences/Sunglasses.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Sunglasses.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Sunglasses.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Sunglasses.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset b/Assets/Content/Data/ObjectAssetReferences/TableBoozeDispenser.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset rename to Assets/Content/Data/ObjectAssetReferences/TableBoozeDispenser.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TableBoozeDispenser.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableBoozeDispenser.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TableBoozeDispenser.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset b/Assets/Content/Data/ObjectAssetReferences/TableFrameSteel.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset rename to Assets/Content/Data/ObjectAssetReferences/TableFrameSteel.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TableFrameSteel.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableFrameSteel.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TableFrameSteel.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset b/Assets/Content/Data/ObjectAssetReferences/TableFrameWood.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset rename to Assets/Content/Data/ObjectAssetReferences/TableFrameWood.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TableFrameWood.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableFrameWood.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TableFrameWood.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset b/Assets/Content/Data/ObjectAssetReferences/TableGlass.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset rename to Assets/Content/Data/ObjectAssetReferences/TableGlass.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TableGlass.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableGlass.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TableGlass.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset b/Assets/Content/Data/ObjectAssetReferences/TablePoker.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset rename to Assets/Content/Data/ObjectAssetReferences/TablePoker.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TablePoker.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TablePoker.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TablePoker.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset b/Assets/Content/Data/ObjectAssetReferences/TableSteel.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset rename to Assets/Content/Data/ObjectAssetReferences/TableSteel.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TableSteel.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableSteel.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TableSteel.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset b/Assets/Content/Data/ObjectAssetReferences/TableWood.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset rename to Assets/Content/Data/ObjectAssetReferences/TableWood.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TableWood.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TableWood.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TableWood.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset b/Assets/Content/Data/ObjectAssetReferences/TileBar.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset rename to Assets/Content/Data/ObjectAssetReferences/TileBar.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileBar.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileBar.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileBar.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset b/Assets/Content/Data/ObjectAssetReferences/TileDirt1.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset rename to Assets/Content/Data/ObjectAssetReferences/TileDirt1.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileDirt1.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileDirt1.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileDirt1.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset b/Assets/Content/Data/ObjectAssetReferences/TileGrass.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset rename to Assets/Content/Data/ObjectAssetReferences/TileGrass.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileGrass.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileGrass.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileGrass.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset b/Assets/Content/Data/ObjectAssetReferences/TileGrey.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset rename to Assets/Content/Data/ObjectAssetReferences/TileGrey.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileGrey.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileGrey.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileGrey.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset b/Assets/Content/Data/ObjectAssetReferences/TileGreyDark.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset rename to Assets/Content/Data/ObjectAssetReferences/TileGreyDark.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileGreyDark.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileGreyDark.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileGreyDark.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset b/Assets/Content/Data/ObjectAssetReferences/TileKitchen.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset rename to Assets/Content/Data/ObjectAssetReferences/TileKitchen.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileKitchen.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileKitchen.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileKitchen.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset b/Assets/Content/Data/ObjectAssetReferences/TileOverlayBlue.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayBlue.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileOverlayBlue.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBlue.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayBlue.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset b/Assets/Content/Data/ObjectAssetReferences/TileOverlayBrown.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayBrown.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileOverlayBrown.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayBrown.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayBrown.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset b/Assets/Content/Data/ObjectAssetReferences/TileOverlayGreen.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayGreen.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileOverlayGreen.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayGreen.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayGreen.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset b/Assets/Content/Data/ObjectAssetReferences/TileOverlayOrange.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayOrange.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileOverlayOrange.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayOrange.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayOrange.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset b/Assets/Content/Data/ObjectAssetReferences/TileOverlayPurple.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayPurple.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileOverlayPurple.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayPurple.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayPurple.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset b/Assets/Content/Data/ObjectAssetReferences/TileOverlayRed.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayRed.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileOverlayRed.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileOverlayRed.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileOverlayRed.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset b/Assets/Content/Data/ObjectAssetReferences/TilePlating.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset rename to Assets/Content/Data/ObjectAssetReferences/TilePlating.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TilePlating.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TilePlating.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TilePlating.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset b/Assets/Content/Data/ObjectAssetReferences/TileReinforced.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset rename to Assets/Content/Data/ObjectAssetReferences/TileReinforced.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileReinforced.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileReinforced.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileReinforced.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset b/Assets/Content/Data/ObjectAssetReferences/TileWhite.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset rename to Assets/Content/Data/ObjectAssetReferences/TileWhite.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileWhite.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileWhite.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileWhite.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset b/Assets/Content/Data/ObjectAssetReferences/TileWood.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset rename to Assets/Content/Data/ObjectAssetReferences/TileWood.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TileWood.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TileWood.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TileWood.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset b/Assets/Content/Data/ObjectAssetReferences/Title1.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Title1.asset rename to Assets/Content/Data/ObjectAssetReferences/Title1.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Title1.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Title1.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Title1.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset b/Assets/Content/Data/ObjectAssetReferences/Title2.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Title2.asset rename to Assets/Content/Data/ObjectAssetReferences/Title2.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Title2.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Title2.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Title2.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset b/Assets/Content/Data/ObjectAssetReferences/Title3.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Title3.asset rename to Assets/Content/Data/ObjectAssetReferences/Title3.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Title3.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Title3.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Title3.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset b/Assets/Content/Data/ObjectAssetReferences/Toolbelt.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset rename to Assets/Content/Data/ObjectAssetReferences/Toolbelt.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Toolbelt.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Toolbelt.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Toolbelt.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset b/Assets/Content/Data/ObjectAssetReferences/ToolboxBlue.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset rename to Assets/Content/Data/ObjectAssetReferences/ToolboxBlue.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset.meta b/Assets/Content/Data/ObjectAssetReferences/ToolboxBlue.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/ToolboxBlue.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/ToolboxBlue.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset b/Assets/Content/Data/ObjectAssetReferences/TruckerCap.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset rename to Assets/Content/Data/ObjectAssetReferences/TruckerCap.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset.meta b/Assets/Content/Data/ObjectAssetReferences/TruckerCap.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/TruckerCap.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/TruckerCap.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset b/Assets/Content/Data/ObjectAssetReferences/VendorHotDrinks.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset rename to Assets/Content/Data/ObjectAssetReferences/VendorHotDrinks.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta b/Assets/Content/Data/ObjectAssetReferences/VendorHotDrinks.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/VendorHotDrinks.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/VendorHotDrinks.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset b/Assets/Content/Data/ObjectAssetReferences/VendorRobustSoftdrinks.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset rename to Assets/Content/Data/ObjectAssetReferences/VendorRobustSoftdrinks.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta b/Assets/Content/Data/ObjectAssetReferences/VendorRobustSoftdrinks.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/VendorRobustSoftdrinks.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/VendorRobustSoftdrinks.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset b/Assets/Content/Data/ObjectAssetReferences/VendorSecTech.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset rename to Assets/Content/Data/ObjectAssetReferences/VendorSecTech.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta b/Assets/Content/Data/ObjectAssetReferences/VendorSecTech.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/VendorSecTech.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/VendorSecTech.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset b/Assets/Content/Data/ObjectAssetReferences/VendorYouTool.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset rename to Assets/Content/Data/ObjectAssetReferences/VendorYouTool.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta b/Assets/Content/Data/ObjectAssetReferences/VendorYouTool.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/VendorYouTool.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/VendorYouTool.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset b/Assets/Content/Data/ObjectAssetReferences/Vent.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Vent.asset rename to Assets/Content/Data/ObjectAssetReferences/Vent.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Vent.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Vent.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Vent.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset b/Assets/Content/Data/ObjectAssetReferences/WaterCooler.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset rename to Assets/Content/Data/ObjectAssetReferences/WaterCooler.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta b/Assets/Content/Data/ObjectAssetReferences/WaterCooler.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/WaterCooler.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/WaterCooler.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset b/Assets/Content/Data/ObjectAssetReferences/WaterTank.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset rename to Assets/Content/Data/ObjectAssetReferences/WaterTank.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta b/Assets/Content/Data/ObjectAssetReferences/WaterTank.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/WaterTank.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/WaterTank.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset b/Assets/Content/Data/ObjectAssetReferences/Welder.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Welder.asset rename to Assets/Content/Data/ObjectAssetReferences/Welder.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Welder.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Welder.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Welder.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Welder.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset b/Assets/Content/Data/ObjectAssetReferences/Wirecutters.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset rename to Assets/Content/Data/ObjectAssetReferences/Wirecutters.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Wirecutters.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Wirecutters.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Wirecutters.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset b/Assets/Content/Data/ObjectAssetReferences/WoodLog.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset rename to Assets/Content/Data/ObjectAssetReferences/WoodLog.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset.meta b/Assets/Content/Data/ObjectAssetReferences/WoodLog.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/WoodLog.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/WoodLog.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset b/Assets/Content/Data/ObjectAssetReferences/WoodPlank.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset rename to Assets/Content/Data/ObjectAssetReferences/WoodPlank.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset.meta b/Assets/Content/Data/ObjectAssetReferences/WoodPlank.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/WoodPlank.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/WoodPlank.asset.meta diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset b/Assets/Content/Data/ObjectAssetReferences/Wrench.asset similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset rename to Assets/Content/Data/ObjectAssetReferences/Wrench.asset diff --git a/Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset.meta b/Assets/Content/Data/ObjectAssetReferences/Wrench.asset.meta similarity index 100% rename from Assets/Content/Data/WorldObjectAssetReferences/Wrench.asset.meta rename to Assets/Content/Data/ObjectAssetReferences/Wrench.asset.meta diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs index e5b9537f30..f675d23557 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs @@ -13,7 +13,7 @@ public partial class ObjectAssetReference /// /// The path in the project where to put the ObjectAssetReference assets. /// - public const string ObjectAssetPath = "Assets/Content/Data/WorldObjectAssetReferences/"; + public const string ObjectAssetPath = "Assets/Content/Data/ObjectAssetReferences/"; [CanBeNull] From b15db472b0b756d63885c9fd7145685a282b7308 Mon Sep 17 00:00:00 2001 From: Rohit Kulkarni <36757355+rohitkulkarni97@users.noreply.github.com> Date: Mon, 23 Feb 2026 17:35:58 -0500 Subject: [PATCH 54/54] Moved #if UNITY_EDITOR to the top to include the using statements as well. --- .../SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs index f675d23557..cc1125ae08 100644 --- a/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs +++ b/Assets/Scripts/SS3D/Data/AssetDatabases/ObjectAssetReference.Editor.cs @@ -1,11 +1,11 @@ -using JetBrains.Annotations; +#if UNITY_EDITOR +using JetBrains.Annotations; using SS3D.Logging; using System.Linq; using UnityEditor.AddressableAssets; using UnityEditor.AddressableAssets.Settings; using UnityEngine; -#if UNITY_EDITOR namespace SS3D.Data.AssetDatabases { public partial class ObjectAssetReference