Revert "Empties (#1151)"

This reverts commit 5f5cdaba3d.

Content.IntegrationTests/Tests/EntityTest.cs

@@ -40,7 +40,6 @@ namespace Content.IntegrationTests.Tests
                     .Where(p => !pair.IsTestPrototype(p))
                     .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
                     .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others
-                    .Where(p => !p.Components.ContainsKey("CP14BiomeSpawner")) // CP14 this component delete all entities on this tile
                     .Select(p => p.ID)
                     .ToList();
 
@@ -104,7 +103,6 @@ namespace Content.IntegrationTests.Tests
                     .Where(p => !pair.IsTestPrototype(p))
                     .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
                     .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others
-                    .Where(p => !p.Components.ContainsKey("CP14BiomeSpawner")) // CP14 this component delete all entities on this tile
                     .Select(p => p.ID)
                     .ToList();
                 foreach (var protoId in protoIds)
@@ -346,7 +344,6 @@ namespace Content.IntegrationTests.Tests
                 "DebugExceptionStartup",
                 "GridFill",
                 "RoomFill",
-                "CP14BiomeSpawner", // CP14 this component delete all entities on this tile
                 "Map", // We aren't testing a map entity in this test
                 "MapGrid",
                 "Broadphase",

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -70,6 +70,7 @@ namespace Content.IntegrationTests.Tests
             "Dev",
             "MeteorArena",
             "Comoss",
+            "Factoria",
             //CrystallEdge Map replacement end
         };
 

Content.Server/Construction/ConstructionSystem.Initial.cs

@@ -2,7 +2,6 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Construction.Components;
-using Content.Shared._CP14.Workbench.Prototypes;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Construction;
 using Content.Shared.Construction.Prototypes;
@@ -237,36 +236,6 @@ namespace Content.Server.Construction
                         }
 
                         break;
-
-                    //CP14 stack group support
-                    case CP14StackGroupConstructionGraphStep stackGroupStep:
-                        foreach (var entity in new HashSet<EntityUid>(EnumerateNearby(user)))
-                        {
-                            if (!stackGroupStep.EntityValid(entity, out var stack))
-                                continue;
-
-                            if (used.Contains(entity))
-                                continue;
-
-                            var splitStack = _stackSystem.Split(entity, stackGroupStep.Amount, user.ToCoordinates(0, 0), stack);
-
-                            if (splitStack == null)
-                                continue;
-
-                            if (string.IsNullOrEmpty(stackGroupStep.Store))
-                            {
-                                if (!_container.Insert(splitStack.Value, container))
-                                    continue;
-                            }
-                            else if (!_container.Insert(splitStack.Value, GetContainer(stackGroupStep.Store)))
-                                continue;
-
-                            handled = true;
-                            break;
-                        }
-
-                        break;
-                    //CP14 stack group support end
                 }
 
                 if (handled == false)

Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs

@@ -97,13 +97,13 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem
 
         foreach (var req in recipe.Requirements)
         {
-            req.PostCraft(EntityManager, _proto, placedEntities, args.User);
+            req.PostCraft(EntityManager, placedEntities, args.User);
         }
 
         //We teleport result to workbench AFTER craft.
         foreach (var resultEntity in resultEntities)
         {
-            _transform.SetCoordinates(resultEntity, Transform(ent).Coordinates.Offset(new Vector2(_random.NextFloat(-0.25f, 0.25f), _random.NextFloat(-0.25f, 0.25f))));
+            _transform.SetCoordinates(resultEntity, Transform(ent).Coordinates.Offset(new Vector2(_random.NextFloat(-0.5f, 0.5f), _random.NextFloat(-0.5f, 0.5f))));
         }
 
         UpdateUIRecipes(ent, args.User);

Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs

@@ -1,5 +1,4 @@
-using Content.Shared._CP14.Workbench.Prototypes;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Validation;
@@ -47,13 +46,6 @@ namespace Content.Shared.Construction.Steps
                 return typeof(PartAssemblyConstructionGraphStep);
             }
 
-            //CP14 stack group support
-            if (node.Has("stackGroup"))
-            {
-                return typeof(CP14StackGroupConstructionGraphStep);
-            }
-            //CP14 stack group support end
-
             return null;
         }
 

Content.Shared/_CP14/Workbench/Prototypes/CP14StackGroupConstructionGraphStep.cs

@@ -1,65 +0,0 @@
-/*
- * This file is sublicensed under MIT License
- * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
- */
-
-using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Construction;
-using Content.Shared.Construction.Steps;
-using Content.Shared.Examine;
-using Content.Shared.Stacks;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Shared._CP14.Workbench.Prototypes;
-
-[DataDefinition]
-public sealed partial class CP14StackGroupConstructionGraphStep : EntityInsertConstructionGraphStep
-{
-    [DataField]
-    public ProtoId<CP14StackGroupPrototype> StackGroup = default!;
-
-    [DataField]
-    public int Amount = 1;
-
-    public override void DoExamine(ExaminedEvent examinedEvent)
-    {
-        var group = IoCManager.Resolve<IPrototypeManager>().Index(StackGroup);
-
-        examinedEvent.PushMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", Loc.GetString(group.Name))));
-    }
-
-    public override bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory)
-    {
-        var group = IoCManager.Resolve<IPrototypeManager>().Index(StackGroup);
-
-        return entityManager.TryGetComponent(uid, out StackComponent? stack) && group.Stacks.Contains(stack.StackTypeId) && stack.Count >= Amount;
-    }
-
-    public bool EntityValid(EntityUid entity, [NotNullWhen(true)] out StackComponent? stack)
-    {
-        var group = IoCManager.Resolve<IPrototypeManager>().Index(StackGroup);
-
-        if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out StackComponent? otherStack) && group.Stacks.Contains(otherStack.StackTypeId) && otherStack.Count >= Amount)
-            stack = otherStack;
-        else
-            stack = null;
-
-        return stack != null;
-    }
-
-    public override ConstructionGuideEntry GenerateGuideEntry()
-    {
-        var proto = IoCManager.Resolve<IPrototypeManager>();
-        var group = proto.Index(StackGroup);
-
-        var firstStack = group.Stacks.FirstOrNull();
-
-        return new ConstructionGuideEntry()
-        {
-            Localization = "construction-presenter-material-step",
-            Arguments = new (string, object)[]{("amount", Amount), ("material", Loc.GetString(group.Name))},
-            Icon = firstStack != null ? proto.Index(firstStack.Value).Icon : SpriteSpecifier.Invalid,
-        };
-    }
-}

Content.Shared/_CP14/Workbench/Prototypes/CP14StackGroupPrototype.cs

@@ -1,25 +0,0 @@
-/*
- * This file is sublicensed under MIT License
- * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
- */
-
-using Content.Shared.Stacks;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._CP14.Workbench.Prototypes;
-
-/// <summary>
-/// Allows you to group several different kinds of stacks into one group. Can be used for situations where different stacks are appropriate for a particular situation
-/// </summary>
-[Prototype("CP14StackGroup")]
-public sealed class CP14StackGroupPrototype : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-
-    [DataField(required: true)]
-    public LocId Name = default!;
-
-    [DataField(required: true)]
-    public List<ProtoId<StackPrototype>> Stacks = new();
-}

Content.Shared/_CP14/Workbench/Requirements/KnowledgeRequired.cs

@@ -34,7 +34,7 @@ public sealed partial class SkillRequired : CP14WorkbenchCraftRequirement
         return haveAllSkills;
     }
 
-    public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager, HashSet<EntityUid> placedEntities, EntityUid user)
+    public override void PostCraft(EntityManager entManager, HashSet<EntityUid> placedEntities, EntityUid user)
     {
     }
 

Content.Shared/_CP14/Workbench/Requirements/MaterialResource.cs

@@ -59,7 +59,7 @@ public sealed partial class MaterialResource : CP14WorkbenchCraftRequirement
         return true;
     }
 
-    public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager, HashSet<EntityUid> placedEntities, EntityUid user)
+    public override void PostCraft(EntityManager entManager, HashSet<EntityUid> placedEntities, EntityUid user)
     {
         var stackSystem = entManager.System<SharedStackSystem>();
 

Content.Shared/_CP14/Workbench/Requirements/ProtoIdResource.cs

@@ -30,7 +30,9 @@ public sealed partial class ProtoIdResource : CP14WorkbenchCraftRequirement
         return indexedIngredients.TryGetValue(ProtoId, out var availableQuantity) && availableQuantity >= Count;
     }
 
-    public override void PostCraft(EntityManager entManager,IPrototypeManager protoManager, HashSet<EntityUid> placedEntities, EntityUid user)
+    public override void PostCraft(EntityManager entManager,
+        HashSet<EntityUid> placedEntities,
+        EntityUid user)
     {
         var requiredCount = Count;
 

Content.Shared/_CP14/Workbench/Requirements/StackGroupResource.cs

@@ -1,97 +0,0 @@
-/*
- * This file is sublicensed under MIT License
- * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT
- */
-
-using Content.Shared._CP14.Workbench.Prototypes;
-using Content.Shared.Stacks;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Shared._CP14.Workbench.Requirements;
-
-public sealed partial class StackGroupResource : CP14WorkbenchCraftRequirement
-{
-    public override bool HideRecipe { get; set; } = false;
-
-    [DataField(required: true)]
-    public ProtoId<CP14StackGroupPrototype> Group;
-
-    [DataField]
-    public int Count = 1;
-
-    public override bool CheckRequirement(EntityManager entManager,
-        IPrototypeManager protoManager,
-        HashSet<EntityUid> placedEntities,
-        EntityUid user,
-        CP14WorkbenchRecipePrototype recipe)
-    {
-        if (!protoManager.TryIndex(Group, out var indexedGroup))
-            return false;
-
-        var count = 0;
-        foreach (var ent in placedEntities)
-        {
-            if (!entManager.TryGetComponent<StackComponent>(ent, out var stack))
-                continue;
-
-            if (!indexedGroup.Stacks.Contains(stack.StackTypeId))
-                continue;
-
-            count += stack.Count;
-        }
-
-        if (count < Count)
-            return false;
-
-        return true;
-    }
-
-    public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager,
-        HashSet<EntityUid> placedEntities,
-        EntityUid user)
-    {
-        var stackSystem = entManager.System<SharedStackSystem>();
-
-        if (!protoManager.TryIndex(Group, out var indexedGroup))
-            return;
-
-        var requiredCount = Count;
-        foreach (var placedEntity in placedEntities)
-        {
-            if (!entManager.TryGetComponent<StackComponent>(placedEntity, out var stack))
-                continue;
-
-            if (!indexedGroup.Stacks.Contains(stack.StackTypeId))
-                continue;
-
-            var count = (int)MathF.Min(requiredCount, stack.Count);
-
-            if (stack.Count - count <= 0)
-                entManager.DeleteEntity(placedEntity);
-            else
-                stackSystem.SetCount(placedEntity, stack.Count - count, stack);
-
-            requiredCount -= count;
-        }
-    }
-
-    public override string GetRequirementTitle(IPrototypeManager protoManager)
-    {
-        var indexedGroup = protoManager.Index(Group);
-
-        return $"{Loc.GetString(indexedGroup.Name)} x{Count}";
-    }
-
-    public override EntityPrototype? GetRequirementEntityView(IPrototypeManager protoManager)
-    {
-        return null;
-    }
-
-    public override SpriteSpecifier? GetRequirementTexture(IPrototypeManager protoManager)
-    {
-        var indexedGroup = protoManager.Index(Group);
-
-        return !protoManager.TryIndex(indexedGroup.Stacks.FirstOrNull(), out var indexedStack) ? null : indexedStack.Icon;
-    }
-}

Content.Shared/_CP14/Workbench/Requirements/StackResource.cs

@@ -44,7 +44,7 @@ public sealed partial class StackResource : CP14WorkbenchCraftRequirement
         return true;
     }
 
-    public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager,
+    public override void PostCraft(EntityManager entManager,
         HashSet<EntityUid> placedEntities,
         EntityUid user)
     {

Content.Shared/_CP14/Workbench/Requirements/TagResource.cs

@@ -50,7 +50,7 @@ public sealed partial class TagResource : CP14WorkbenchCraftRequirement
         return true;
     }
 
-    public override void PostCraft(EntityManager entManager, IPrototypeManager protoManager, HashSet<EntityUid> placedEntities, EntityUid user)
+    public override void PostCraft(EntityManager entManager, HashSet<EntityUid> placedEntities, EntityUid user)
     {
         var tagSystem = entManager.System<TagSystem>();
 

Content.Shared/_CP14/Workbench/WorkbenchCraftRequirement.cs

@@ -33,7 +33,6 @@ public abstract partial class CP14WorkbenchCraftRequirement
     /// An event that is triggered after crafting. This is the place to put important things like removing items, spending stacks or other things.
     /// </summary>
     public abstract void PostCraft(EntityManager entManager,
-        IPrototypeManager protoManager,
         HashSet<EntityUid> placedEntities,
         EntityUid user);
 

Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl

@@ -1,34 +1,14 @@
-marking-CP14HumanFacialHair3Clock = morning stubble
-marking-CP14HumanFacialHair5oclockmoustache =  evening mustache
-marking-CP14HumanFacialHair7oclock = dusk stubble
-marking-CP14HumanFacialHair7oclockmoustache = dusk mustache
-marking-CP14HumanFacialHairAbe = elderborn
-marking-CP14HumanFacialHairChinlessbeard = chinless
-marking-CP14HumanFacialHairDwarf = stone short
-marking-CP14HumanFacialHairDwarf2 = forge battle
-marking-CP14HumanFacialHairElvis = curled courtly
-marking-CP14HumanFacialHairFiveoclock = noon shadow
-marking-CP14HumanFacialHairFullbeard = full war
-marking-CP14HumanFacialHairFumanchu = mustache of desert winds
-marking-CP14HumanFacialHairGoateemush = mossy goat
-marking-CP14HumanFacialHairGt = steel trim
-marking-CP14HumanFacialHairHip = wildgrass
-marking-CP14HumanFacialHairHogan = stormblade
-marking-CP14HumanFacialHairJensen = northern hold
-marking-CP14HumanFacialHairLongbeard = longhang
-marking-CP14HumanFacialHairMartialartist = path of silence
-marking-CP14HumanFacialHairMartialartist2 =  path of the blade
-marking-CP14HumanFacialHairMoonshiner = moon wanderer
-marking-CP14HumanFacialHairMoustache = commoner’s mustache
-marking-CP14HumanFacialHairMutton = road whiskers
-marking-CP14HumanFacialHairMuttonmus = herald’s whiskers
-marking-CP14HumanFacialHairNeckbeard = shadow chin
-marking-CP14HumanFacialHairPencilstache = line of the mustached
-marking-CP14HumanFacialHairSelleck = hunter’s cluster
-marking-CP14HumanFacialHairSideburn = side mark
-marking-CP14HumanFacialHairSmallstache = page’s mustache
-marking-CP14HumanFacialHairVandyke = evening branch
-marking-CP14HumanFacialHairVolaju = steppe fringe
-marking-CP14HumanFacialHairWalrus = walrus storm
-marking-CP14HumanFacialHairWatson = scholarly classic
-marking-CP14HumanFacialHairWise = runebound
+marking-CP14HumanFacialHair3Clock = 3 O'clock
+marking-CP14HumanFacialHairAbe = Abe
+marking-CP14HumanFacialHairDwarf = Dwarf
+marking-CP14HumanFacialHairGoateeMush = Goatee
+marking-CP14HumanFacialHairBriefs = Briefs
+marking-CP14HumanFacialHairCircle = Circle
+marking-CP14HumanFacialHairEspanol = Espanol
+marking-CP14HumanFacialHairImperial = Imperial
+marking-CP14HumanFacialHairMachete = Machete
+marking-CP14HumanFacialHairMutton = Mutton
+marking-CP14HumanFacialHairPigtail = Pigtail
+marking-CP14HumanFacialHairSage = Sage
+marking-CP14HumanFacialHairWatson = Watson
+marking-CP14HumanFacialHairWhiskers = Whiskers

Resources/Locale/en-US/_CP14/stack/materials.ftl

@@ -1,8 +1,7 @@
 cp14-stack-dirt-block = dirt blocks
 cp14-stack-stone-block = stone blocks
 cp14-stack-marble-block = marble rocks
-cp14-stack-wood-planks = oak planks
-cp14-stack-wood-planks-birch = birch planks
+cp14-stack-wood-planks = wooden planks
 cp14-stack-nails = nails
 cp14-stack-cloth = rolls of fabric
 cp14-stack-flora = tufts of grass
@@ -23,5 +22,3 @@ cp14-stack-wallpaper = rolls of wallpaper
 cp14-stack-glass-sheet = glass
 
 cp14-stack-ash-pile = pile of ashes
-
-cp14-stack-group-wooden-planks-any = planks (any)

Resources/Locale/en-US/_CP14/tiles/tiles.ftl

@@ -10,6 +10,7 @@ cp14-tiles-sand = sand
 cp14-tiles-snow = snow
 cp14-tiles-snow-deep = deep snow
 cp14-tiles-snow-deep-deep = deep deep snow
+cp14-tiles-marble-cave = marble floor
 
 # Produced
 cp14-tiles-foundation = foundation
@@ -61,7 +62,7 @@ cp14-tiles-stonebricks-small-carved2 = carved brick floor
 cp14-tiles-stonebricks-square-carved = carved brick floor
 cp14-tiles-stonebricks = stonebrick floor
 cp14-tiles-stonebricks-weather = street stonebrick floor
-cp14-tiles-stonebricks-marble = marble floor
+cp14-tiles-stonebricks-marble = marble brick floor
 
 cp14-tiles-lucens-woodplanks = lucens woodplanks
 cp14-tiles-lucens-woodplanks-big = big lucens planks

Resources/Locale/ru-RU/_CP14/stack/materials.ftl

@@ -1,8 +1,7 @@
 cp14-stack-dirt-block = блоки земли
 cp14-stack-stone-block = каменные блоки
 cp14-stack-marble-block = мраморные камни
-cp14-stack-wood-planks = дубовые доски
-cp14-stack-wood-planks-birch = березовые доски
+cp14-stack-wood-planks = деревянные доски
 cp14-stack-nails = гвозди
 cp14-stack-cloth = рулоны ткани
 cp14-stack-flora = пучки травы
@@ -23,7 +22,3 @@ cp14-stack-wallpaper = рулон обоев
 cp14-stack-glass-sheet = стекло
 
 cp14-stack-ash-pile = кучка пепла
-
-
-
-cp14-stack-group-wooden-planks-any = доски (любые)

Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl

@@ -10,6 +10,7 @@ cp14-tiles-sand = песок
 cp14-tiles-snow = снег
 cp14-tiles-snow-deep = глубокий снег
 cp14-tiles-snow-deep-deep = очень глубокий снег
+cp14-tiles-marble-cave = мраморный пол
 
 # Produced
 cp14-tiles-foundation = фундамент
@@ -61,7 +62,7 @@ cp14-tiles-stonebricks-small-carved2 = пол из резного кирпича
 cp14-tiles-stonebricks-square-carved = пол из резного кирпича
 cp14-tiles-stonebricks = каменный кирпичный пол
 cp14-tiles-stonebricks-weather = уличный каменный кирпичный пол
-cp14-tiles-stonebricks-marble = мраморный пол
+cp14-tiles-stonebricks-marble = мраморный кирпич
 
 cp14-tiles-lucens-woodplanks = люценcовые доски
 cp14-tiles-lucens-woodplanks-big = большие люценcовые доски

Resources/Maps/_CP14/Empties/cave_empty.yml

@@ -1,129 +0,0 @@
-meta:
-  format: 7
-  category: Map
-  engineVersion: 250.0.0
-  forkId: ""
-  forkVersion: ""
-  time: 04/08/2025 12:22:24
-  entityCount: 1
-maps:
-- 2
-grids:
-- 2
-orphans: []
-nullspace: []
-tilemap:
-  0: Space
-  9: CP14FloorBase
-  12: CP14FloorBirchWoodPlanksCruciform
-  8: CP14FloorDirt
-  27: CP14FloorFoundation
-  28: CP14FloorGrass
-  29: CP14FloorGrassLight
-  10: CP14FloorGrassTall
-  14: CP14FloorIce
-  13: CP14FloorLucensWoodPlanks
-  32: CP14FloorOakWoodPlanks
-  2: CP14FloorOakWoodPlanksBig
-  4: CP14FloorOakWoodPlanksBroken
-  1: CP14FloorOakWoodPlanksCruciform
-  3: CP14FloorOakWoodPlanksStairways
-  11: CP14FloorRedWoodPlanksCruciform
-  49: CP14FloorStonebricks
-  50: CP14FloorStonebricksSmallCarved1
-  51: CP14FloorStonebricksSmallCarved2
-  7: CP14FloorStonebricksSquareCarved
-  6: CP14FloorWoodPlanksBurned
-  5: CP14FloorWoodPlanksStairwaysBurned
-  53: FloorIce
-entities:
-- proto: ""
-  entities:
-  - uid: 2
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: MapAtmosphere
-      space: False
-      mixture:
-        volume: 2500
-        immutable: True
-        temperature: 293.15
-        moles:
-        - 21.82478
-        - 82.10312
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: CP14WeatherController
-      entries:
-      - weight: 2
-        visuals: null
-      - visuals: CP14Mist
-    - type: MapGrid
-      chunks:
-        0,0:
-          ind: 0,0
-          tiles: MQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAMQAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      canCollide: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: OccluderTree
-    - type: SpreaderGrid
-    - type: Shuttle
-    - type: GridPathfinding
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-      inherent: True
-      enabled: True
-    - type: Biome
-      forcedMarkerLayers: []
-      markerLayers: []
-      loadedMarkers: {}
-      pendingMarkers: {}
-      loadedChunks: []
-      entities: {}
-      decals: {}
-      modifiedTiles: {}
-      template: CP14CavesIndestructibleFill
-      layers: []
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes: []
-    - type: GasTileOverlay
-...

Resources/Maps/_CP14/Empties/grassland_empty.yml

@@ -1,149 +0,0 @@
-meta:
-  format: 7
-  category: Map
-  engineVersion: 250.0.0
-  forkId: ""
-  forkVersion: ""
-  time: 04/08/2025 12:18:15
-  entityCount: 1
-maps:
-- 2
-grids:
-- 2
-orphans: []
-nullspace: []
-tilemap:
-  0: Space
-  9: CP14FloorBase
-  10: CP14FloorBirchWoodPlanks
-  15: CP14FloorBirchWoodPlanksBig
-  21: CP14FloorBirchWoodPlanksCruciform
-  20: CP14FloorDarkWoodPlanksBig
-  8: CP14FloorDarkWoodPlanksStairways
-  2: CP14FloorDirt
-  4: CP14FloorFoundation
-  28: CP14FloorGrass
-  29: CP14FloorGrassLight
-  30: CP14FloorGrassTall
-  31: CP14FloorIce
-  26: CP14FloorLucensWoodPlanksCruciform
-  27: CP14FloorLucensWoodPlanksStairways
-  14: CP14FloorMarble
-  5: CP14FloorOakWoodPlanks
-  19: CP14FloorOakWoodPlanksBig
-  6: CP14FloorOakWoodPlanksCruciform
-  7: CP14FloorOakWoodPlanksStairways
-  1: CP14FloorSand
-  23: CP14FloorSnow
-  24: CP14FloorSnowDeep
-  22: CP14FloorSnowDeepDeep
-  3: CP14FloorStonebricks
-  13: CP14FloorStonebricksSmallCarved1
-  17: CP14FloorStonebricksSmallCarved2
-  25: CP14FloorStonebricksSnowed
-  16: CP14FloorStonebricksSquareCarved
-  11: CP14FloorWoodPlanksBurned
-  12: CP14FloorWoodPlanksStairwaysBurned
-  18: FloorIce
-entities:
-- proto: ""
-  entities:
-  - uid: 2
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: Roof
-      data: {}
-#    - type: BecomesStation
-#      id: Comoss # ENTER YOUR NAME OR DELETE IT
-    - type: CP14WeatherController
-      entries:
-      - weight: 3
-        visuals: null
-      - visuals: CP14Mist
-      - visuals: CP14Rain
-    - type: LightCycle
-    - type: SunShadow
-    - type: SunShadowCycle
-    - type: Biome
-      forcedMarkerLayers: []
-      markerLayers: []
-      loadedMarkers: {}
-      pendingMarkers: {}
-      loadedChunks: []
-      entities: {}
-      decals: {}
-      modifiedTiles: {}
-      template: CP14SandOceanFill
-      layers: []
-    - type: MapGrid
-      chunks:
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHAAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,0:
-          ind: 0,0
-          tiles: HgAAAAAAHAAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHAAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHQAAAAAAHAAAAAAAHgAAAAAA
-          version: 6
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      canCollide: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: OccluderTree
-    - type: SpreaderGrid
-    - type: Shuttle
-    - type: GridPathfinding
-    - type: CP14CloudShadows
-    - type: MapLight
-      ambientLightColor: '#D8B059FF'
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-      inherent: True
-      enabled: True
-    - type: MapAtmosphere
-      space: False
-      mixture:
-        volume: 2500
-        immutable: True
-        temperature: 293.15
-        moles:
-        - 21.824879
-        - 82.10312
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes: []
-    - type: GasTileOverlay
-...

Resources/Maps/_CP14/dev_map.yml

@@ -43,9 +43,10 @@ entities:
       data: {}
     - type: CP14CloudShadows
     - type: MapLight
-    - type: LightCycle
+      ambientLightColor: "#DDDDDDFF"
     - type: SunShadow
-    - type: SunShadowCycle
+      alpha: 0.8
+      direction: 1, -1.5
     - type: Biome
       forcedMarkerLayers: []
       markerLayers: []

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml

@@ -0,0 +1,45 @@
+- type: entity
+  id: CP14ConstrainedSpawnerBase
+  abstract: true
+  parent: MarkerBase
+  description: lol
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+  - type: Physics
+    bodyType: Static
+    fixedRotation: true
+  - type: Fixtures
+    fixtures:
+      spawn:
+        shape:
+          !type:PhysShapeCircle
+          radius: 15
+        hard: false
+        layer:
+          - AllMask
+  - type: TriggerOnCollide
+    fixtureID: spawn
+  - type: StepTrigger
+    requiredTriggeredSpeed: 0
+    stepOn: true
+
+- type: entity
+  parent: CP14ConstrainedSpawnerBase
+  id: CP14ConstrainedSpawnerXeno
+  name: xeno constrained spawner
+  components:
+  - type: TriggerOnCollide
+    fixtureID: spawn
+  - type: CP14ConstrainedSpawnerOnTrigger
+    prototypes:
+    - CP14MobXeno
+    - CP14MobXenoDrone
+    - CP14MobSpaceCobra
+    - CP14MobSmallPurpleSnake
+    - CP14MobPurpleSnake
+    - MobLuminousEntity
+    - MobLuminousObject
+    - CP14MobWatcherMagmawing

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml

@@ -137,4 +137,18 @@
         color: green
       - state: frame
   - type: CP14BiomeSpawner
-    biome: CP14LeafMaze
+    biome: CP14LeafMaze
+
+- type: entity
+  id: CP14BiomeSpawnerMarbleCave
+  parent: CP14BaseBiomeSpawner
+  suffix: Marble cave
+  components:
+  - type: Sprite
+    layers:
+      - state: cave
+      - state: frame
+      - sprite: _CP14/Objects/Materials/marble_block.rsi
+        state: stone_3
+  - type: CP14BiomeSpawner
+    biome: CP14MarbleCaves 

Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml

@@ -6,30 +6,6 @@
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
       state: 3oclock
 
-- type: marking
-  id: CP14HumanFacialHair5oclockmoustache
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: 5oclockmoustache
-
-- type: marking
-  id: CP14HumanFacialHair7oclock
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: 7oclock
-
-- type: marking
-  id: CP14HumanFacialHair7oclockmoustache
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: 7oclockmoustache
-
 - type: marking
   id: CP14HumanFacialHairAbe
   bodyPart: FacialHair
@@ -38,14 +14,6 @@
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
       state: abe
 
-- type: marking
-  id: CP14HumanFacialHairChinlessbeard
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: chinlessbeard
-
 - type: marking
   id: CP14HumanFacialHairDwarf
   bodyPart: FacialHair
@@ -55,47 +23,7 @@
       state: dwarf
 
 - type: marking
-  id: CP14HumanFacialHairDwarf2
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: dwarf2
-
-- type: marking
-  id: CP14HumanFacialHairElvis
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: elvis
-
-- type: marking
-  id: CP14HumanFacialHairFiveoclock
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: fiveoclock
-
-- type: marking
-  id: CP14HumanFacialHairFullbeard
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: fullbeard
-
-- type: marking
-  id: CP14HumanFacialHairFumanchu
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: fumanchu
-
-- type: marking
-  id: CP14HumanFacialHairGoateemush
+  id: CP14HumanFacialHairGoateeMush
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
@@ -103,76 +31,44 @@
       state: goateemush
 
 - type: marking
-  id: CP14HumanFacialHairGt
+  id: CP14HumanFacialHairBriefs
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: gt
+      state: briefs
 
 - type: marking
-  id: CP14HumanFacialHairHip
+  id: CP14HumanFacialHairCircle
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: hip
+      state: circle
 
 - type: marking
-  id: CP14HumanFacialHairHogan
+  id: CP14HumanFacialHairEspanol
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: hogan
+      state: espanol
 
 - type: marking
-  id: CP14HumanFacialHairJensen
+  id: CP14HumanFacialHairImperial
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: jensen
+      state: imperial
 
 - type: marking
-  id: CP14HumanFacialHairLongbeard
+  id: CP14HumanFacialHairMachete
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: longbeard
-
-- type: marking
-  id: CP14HumanFacialHairMartialartist
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: martialartist
-
-- type: marking
-  id: CP14HumanFacialHairMartialartist2
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: martialartist2
-  
-- type: marking
-  id: CP14HumanFacialHairMoonshiner
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: moonshiner
-
-- type: marking
-  id: CP14HumanFacialHairMoustache
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: moustache
+      state: machete
 
 - type: marking
   id: CP14HumanFacialHairMutton
@@ -183,76 +79,20 @@
       state: mutton
 
 - type: marking
-  id: CP14HumanFacialHairMuttonmus
+  id: CP14HumanFacialHairPigtail
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: muttonmus
+      state: pigtail
 
 - type: marking
-  id: CP14HumanFacialHairNeckbeard
+  id: CP14HumanFacialHairSage
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: neckbeard
-
-- type: marking
-  id: CP14HumanFacialHairPencilstache
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: pencilstache
-
-- type: marking
-  id: CP14HumanFacialHairSelleck
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: selleck
-
-- type: marking
-  id: CP14HumanFacialHairSideburn
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: sideburn
-
-- type: marking
-  id: CP14HumanFacialHairSmallstache
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: smallstache
-
-- type: marking
-  id: CP14HumanFacialHairVandyke
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: vandyke
-
-- type: marking
-  id: CP14HumanFacialHairVolaju
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: volaju
-
-- type: marking
-  id: CP14HumanFacialHairWalrus
-  bodyPart: FacialHair
-  markingCategory: FacialHair
-  sprites:
-    - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: walrus
+      state: sage
 
 - type: marking
   id: CP14HumanFacialHairWatson
@@ -263,9 +103,9 @@
       state: watson
 
 - type: marking
-  id: CP14HumanFacialHairWise
+  id: CP14HumanFacialHairWhiskers
   bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi
-      state: wise
+      state: whiskers

Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml

@@ -45,10 +45,8 @@
       0: Alive
       50: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed: 2
-    baseSprintSpeed: 4
-    friction: 0.5
-    acceleration: 3
+    baseWalkSpeed: 5
+    baseSprintSpeed: 7
   - type: ProjectileBatteryAmmoProvider
     proto: WatcherBolt
     fireCost: 50

Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml

@@ -0,0 +1,84 @@
+- type: entity
+  id: CP14MobXeno
+  parent: MobXeno
+  categories: [ ForkFiltered ]
+  components:
+  - type: NpcFactionMember
+    factions:
+    - CP14Monster
+
+- type: entity
+  id: CP14MobXenoDrone
+  parent: MobXenoDrone
+  categories: [ ForkFiltered ]
+  components:
+  - type: NpcFactionMember
+    factions:
+    - CP14Monster
+
+- type: entity
+  id: CP14MobSpaceCobra
+  name: cobra
+  parent: MobCobraSpace
+  categories: [ ForkFiltered ]
+  components:
+  - type: NpcFactionMember
+    factions:
+    - CP14Monster
+  - type: MeleeChemicalInjector
+    transferAmount: 2
+  - type: MeleeWeapon
+    hidden: true
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Piercing: 2
+        Poison: 2
+
+- type: entity
+  id: CP14MobPurpleSnake
+  parent: MobPurpleSnake
+  categories: [ ForkFiltered ]
+  components:
+  - type: NpcFactionMember
+    factions:
+    - CP14Monster
+  - type: MeleeWeapon
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Piercing: 1
+  - type: MeleeChemicalInjector
+    transferAmount: 3
+
+- type: entity
+  id: CP14MobSmallPurpleSnake
+  parent: MobSmallPurpleSnake
+  categories: [ ForkFiltered ]
+  components:
+  - type: NpcFactionMember
+    factions:
+    - CP14Monster
+  - type: SolutionTransfer
+    maxTransferAmount: 0.2
+  - type: MeleeWeapon
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Piercing: 0.5
+  - type: MeleeChemicalInjector
+    transferAmount: 2
+
+- type: entity
+  id: CP14MobWatcherMagmawing
+  parent: MobWatcherMagmawing
+  categories: [ ForkFiltered ]
+  components:
+  - type: NpcFactionMember
+    factions:
+    - CP14Monster

Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml

@@ -0,0 +1,124 @@
+- type: entity
+  id: CP14DirtBlock1
+  parent: BaseItem
+  name: dirt block
+  description: A block of excellent black soil.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/dirt_block.rsi
+    layers:
+      - state: dirt
+        map: ["base"]
+  - type: FloorTile
+    placeTileSound:
+      collection: CP14Digging
+      params:
+        variation: 0.03
+        volume: 2
+    outputs:
+      - CP14FloorDirt
+  - type: Appearance
+  - type: Stack
+    stackType: CP14Dirt
+    count: 1
+    baseLayer: base
+    layerStates:
+    - dirt
+    - dirt_2
+    - dirt_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Dirt: 100
+  - type: CP14MagicEssenceContainer
+    essences:
+      Earth: 1
+
+- type: entity
+  id: CP14DirtBlock10
+  parent: CP14DirtBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
+- type: entity
+  id: CP14StoneBlock1
+  parent: BaseItem
+  name: stone block
+  description: A block of cold stone.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/stone_block.rsi
+    layers:
+      - state: stone
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14Stone
+    count: 1
+    baseLayer: base
+    layerStates:
+    - stone
+    - stone_2
+    - stone_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Stone: 100
+  - type: CP14MagicEssenceContainer
+    essences:
+      Earth: 1
+
+- type: entity
+  id: CP14StoneBlock10
+  parent: CP14StoneBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
+- type: entity
+  id: CP14MarbleBlock1
+  parent: BaseItem
+  name: marble block
+  description: A block of white marble.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Materials/marble_block.rsi
+    layers:
+      - state: stone
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14MarbleStone
+    count: 1
+    baseLayer: base
+    layerStates:
+    - stone
+    - stone_2
+    - stone_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14MarbleStone: 100
+
+- type: entity
+  id: CP14MarbleBlock10
+  parent: CP14MarbleBlock1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10

Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml

@@ -1,90 +1,192 @@
 - type: entity
-  id: CP14DirtBlock1
+  id: CP14WoodLog
   parent: BaseItem
-  name: dirt block
-  description: A block of excellent black soil.
+  name: wooden log
+  description: A piece of unprocessed wood. Good material for building, or starting a fire.
   categories: [ ForkFiltered ]
   components:
   - type: Item
     size: Normal
+    shape:
+    - 0,0,1,0
   - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/dirt_block.rsi
+    sprite: _CP14/Objects/Materials/wood.rsi
     layers:
-      - state: dirt
+      - state: log
+        map: ["random"]
+  - type: RandomSprite
+    available:
+      - random:
+          log: ""
+          log_2: ""
+          log_3: ""
+  - type: Tag
+    tags:
+    - CP14FireplaceFuel
+    - Wooden
+  - type: Flammable
+    fireSpread: false
+    canResistFire: false
+    alwaysCombustible: true
+    canExtinguish: true
+    cP14FireplaceFuel: 30
+    damage:
+      types:
+        Heat: 1
+  - type: Log
+    spawnedPrototype: CP14WoodenPlanks1
+    spawnCount: 3
+  - type: Appearance
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  id: CP14WoodenPlanks1
+  parent: BaseItem
+  name: wooden planks
+  description: Treated and ready-to-use wood.
+  categories: [ ForkFiltered ]
+  suffix: 1
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/wood.rsi
+    layers:
+      - state: planks
         map: ["base"]
+  - type: Tag
+    tags:
+    - CP14FireplaceFuel
+    - Wooden
+  - type: Flammable
+    fireSpread: false
+    canResistFire: false
+    alwaysCombustible: true
+    canExtinguish: true
+    cP14FireplaceFuel: 12
+    damage:
+      types:
+        Heat: 1
+  - type: Appearance
+  - type: Stack
+    stackType: CP14WoodenPlanks
+    count: 1
+    baseLayer: base
+    layerStates:
+    - planks
+    - planks_2
+    - planks_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14WoodenPlanks: 100
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  id: CP14WoodenPlanks10
+  parent: CP14WoodenPlanks1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
+- type: entity
+  id: CP14WoodenPlanks20
+  parent: CP14WoodenPlanks1
+  suffix: 20
+  components:
+  - type: Stack
+    count: 20
+
+- type: entity
+  id: CP14LucensWoodLog
+  parent: CP14WoodLog
+  name: lucens log
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/lucens_wood.rsi
+    layers:
+      - state: log
+        map: ["random"]
+  - type: RandomSprite
+    available:
+      - random:
+          log: ""
+          log_2: ""
+          log_3: ""
+  - type: Log
+    spawnedPrototype: CP14LucensWoodenPlanks1
+    spawnCount: 3
+
+- type: entity
+  id: CP14LucensWoodenPlanks1
+  parent: CP14WoodenPlanks1
+  name: lucens planks
+  suffix: 1
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/lucens_wood.rsi
+    layers:
+      - state: planks
+        map: ["base"]
+  - type: Stack
+    stackType: CP14LucensWoodenPlanks
+    count: 1
+    baseLayer: base
+    layerStates:
+    - planks
+    - planks_2
+    - planks_3
   - type: FloorTile
     placeTileSound:
-      collection: CP14Digging
+      path: /Audio/Effects/woodenclosetclose.ogg
       params:
         variation: 0.03
         volume: 2
     outputs:
-      - CP14FloorDirt
-  - type: Appearance
-  - type: Stack
-    stackType: CP14Dirt
-    count: 1
-    baseLayer: base
-    layerStates:
-    - dirt
-    - dirt_2
-    - dirt_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Dirt: 100
-  - type: CP14MagicEssenceContainer
-    essences:
-      Earth: 1
+      - CP14FloorLucensWoodPlanks
 
 - type: entity
-  id: CP14DirtBlock10
-  parent: CP14DirtBlock1
+  id: CP14LucensWoodenPlanks10
+  parent: CP14LucensWoodenPlanks1
   suffix: 10
   components:
   - type: Stack
     count: 10
 
 - type: entity
-  id: CP14StoneBlock1
-  parent: BaseItem
-  name: stone block
-  description: A block of cold stone.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Objects/Materials/stone_block.rsi
-    layers:
-      - state: stone
-        map: ["base"]
-  - type: Appearance
-  - type: Stack
-    stackType: CP14Stone
-    count: 1
-    baseLayer: base
-    layerStates:
-    - stone
-    - stone_2
-    - stone_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Stone: 100
-  - type: CP14MagicEssenceContainer
-    essences:
-      Earth: 1
-
-- type: entity
-  id: CP14StoneBlock10
-  parent: CP14StoneBlock1
-  suffix: 10
+  id: CP14LucensWoodenPlanks20
+  parent: CP14LucensWoodenPlanks1
+  suffix: 20
   components:
   - type: Stack
-    count: 10
+    count: 20
 
 - type: entity
   id: CP14Nail1

Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml

@@ -1,241 +0,0 @@
-- type: entity
-  id: CP14WoodLog
-  parent: BaseItem
-  name: wooden log
-  description: A piece of unprocessed wood. Good material for building, or starting a fire.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Normal
-    shape:
-    - 0,0,1,0
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/wood.rsi
-    layers:
-      - state: log
-        map: ["random"]
-  - type: RandomSprite
-    available:
-      - random:
-          log: ""
-          log_2: ""
-          log_3: ""
-  - type: Tag
-    tags:
-    - CP14FireplaceFuel
-    - Wooden
-  - type: Flammable
-    fireSpread: false
-    canResistFire: false
-    alwaysCombustible: true
-    canExtinguish: true
-    cP14FireplaceFuel: 30
-    damage:
-      types:
-        Heat: 1
-  - type: Log
-    spawnedPrototype: CP14WoodenPlanks1
-    spawnCount: 3
-  - type: Appearance
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Wood
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 25
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: WoodDestroy
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-
-- type: entity
-  id: CP14WoodenPlanks1
-  parent: BaseItem
-  name: wooden planks
-  description: Treated and ready-to-use wood.
-  categories: [ ForkFiltered ]
-  suffix: 1
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/wood.rsi
-    layers:
-      - state: planks
-        map: ["base"]
-  - type: Tag
-    tags:
-    - CP14FireplaceFuel
-    - Wooden
-  - type: Flammable
-    fireSpread: false
-    canResistFire: false
-    alwaysCombustible: true
-    canExtinguish: true
-    cP14FireplaceFuel: 12
-    damage:
-      types:
-        Heat: 1
-  - type: Appearance
-  - type: Stack
-    stackType: CP14WoodenPlanks
-    count: 1
-    baseLayer: base
-    layerStates:
-    - planks
-    - planks_2
-    - planks_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14WoodenPlanks: 100
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Wood
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 25
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: WoodDestroy
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-
-- type: entity
-  id: CP14WoodenPlanks10
-  parent: CP14WoodenPlanks1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
-- type: entity
-  id: CP14WoodenPlanks20
-  parent: CP14WoodenPlanks1
-  suffix: 20
-  components:
-  - type: Stack
-    count: 20
-
-# Lucen
-
-- type: entity
-  id: CP14LucensWoodLog
-  parent: CP14WoodLog
-  name: lucens log
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/wood_lucens.rsi
-    layers:
-      - state: log
-        map: ["random"]
-  - type: RandomSprite
-    available:
-      - random:
-          log: ""
-          log_2: ""
-          log_3: ""
-  - type: Log
-    spawnedPrototype: CP14LucensWoodenPlanks1
-    spawnCount: 3
-
-- type: entity
-  id: CP14LucensWoodenPlanks1
-  parent: CP14WoodenPlanks1
-  name: lucens planks
-  suffix: 1
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/wood_lucens.rsi
-    layers:
-      - state: planks
-        map: ["base"]
-  - type: Stack
-    stackType: CP14LucensWoodenPlanks
-    count: 1
-    baseLayer: base
-    layerStates:
-    - planks
-    - planks_2
-    - planks_3
-
-- type: entity
-  id: CP14LucensWoodenPlanks10
-  parent: CP14LucensWoodenPlanks1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
-- type: entity
-  id: CP14LucensWoodenPlanks20
-  parent: CP14LucensWoodenPlanks1
-  suffix: 20
-  components:
-  - type: Stack
-    count: 20
-
-#Birch
-
-- type: entity
-  id: CP14BirchWoodLog
-  parent: CP14WoodLog
-  name: birch log
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/wood_birch.rsi
-    layers:
-      - state: log
-        map: ["random"]
-  - type: RandomSprite
-    available:
-      - random:
-          log: ""
-          log_2: ""
-          log_3: ""
-  - type: Log
-    spawnedPrototype: CP14BirchWoodenPlanks1
-    spawnCount: 3
-
-- type: entity
-  id: CP14BirchWoodenPlanks1
-  parent: CP14WoodenPlanks1
-  name: birch planks
-  suffix: 1
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/wood_birch.rsi
-    layers:
-      - state: planks
-        map: ["base"]
-  - type: Stack
-    stackType: CP14BirchWoodenPlanks
-    count: 1
-    baseLayer: base
-    layerStates:
-    - planks
-    - planks_2
-    - planks_3
-
-- type: entity
-  id: CP14BirchWoodenPlanks10
-  parent: CP14BirchWoodenPlanks1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
-- type: entity
-  id: CP14BirchWoodenPlanks20
-  parent: CP14BirchWoodenPlanks1
-  suffix: 20
-  components:
-  - type: Stack
-    count: 20

Resources/Prototypes/_CP14/Entities/Objects/Misc/tiles.yml

@@ -66,6 +66,19 @@
   - type: Stack
     stackType: CP14FloorTileMarbleBrick
 
+- type: entity
+  parent: CP14FloorTileBase
+  id: CP14FloorTileMarbleSmallbricks
+  name: marble small brick
+  components:
+  - type: Sprite
+    state: marble_smallbricks
+  - type: FloorTile
+    outputs:
+      - CP14FloorMarbleSmallbricks
+  - type: Stack
+    stackType: CP14FloorTileMarbleSmallbricks
+
 - type: entity
   parent: CP14FloorTileBase
   id: CP14FloorTileOakWoodplanks
@@ -74,11 +87,6 @@
   - type: Sprite
     state: oak_woodplanks
   - type: FloorTile
-    placeTileSound:
-      path: /Audio/Effects/woodenclosetclose.ogg
-      params:
-        variation: 0.03
-        volume: 2
     outputs:
       - CP14FloorOakWoodPlanks
   - type: Stack
@@ -188,77 +196,4 @@
     outputs:
       - CP14FloorStonebricksSquareCarved
   - type: Stack
-    stackType: CP14FloorTileStonebricksSquareCarved
-
-
-- type: entity
-  parent: CP14FloorTileBase
-  id: CP14FloorTileBirchWoodplanks
-  name: birch woodplanks
-  components:
-  - type: Sprite
-    state: birch_woodplanks
-  - type: FloorTile
-    placeTileSound:
-      path: /Audio/Effects/woodenclosetclose.ogg
-      params:
-        variation: 0.03
-        volume: 2
-    outputs:
-      - CP14FloorBirchWoodPlanks
-  - type: Stack
-    stackType: CP14FloorTileBirchWoodplanks
-
-- type: entity
-  parent: CP14FloorTileBase
-  id: CP14FloorTileBirchWoodplanksBig
-  name: birch big woodplanks
-  components:
-  - type: Sprite
-    state: birch_woodplanks_big
-  - type: FloorTile
-    placeTileSound:
-      path: /Audio/Effects/woodenclosetclose.ogg
-      params:
-        variation: 0.03
-        volume: 2
-    outputs:
-      - CP14FloorBirchWoodPlanksBig
-  - type: Stack
-    stackType: CP14FloorTileBirchWoodplanksBig
-
-- type: entity
-  parent: CP14FloorTileBase
-  id: CP14FloorTileBirchWoodplanksCruciform
-  name: birch cruciform woodplanks
-  components:
-  - type: Sprite
-    state: birch_woodplanks_cruciform
-  - type: FloorTile
-    placeTileSound:
-      path: /Audio/Effects/woodenclosetclose.ogg
-      params:
-        variation: 0.03
-        volume: 2
-    outputs:
-      - CP14FloorBirchWoodPlanksCruciform
-  - type: Stack
-    stackType: CP14FloorTileBirchWoodplanksCruciform
-
-- type: entity
-  parent: CP14FloorTileBase
-  id: CP14FloorTileBirchWoodplanksStairs
-  name: birch stairs woodplanks
-  components:
-  - type: Sprite
-    state: birch_woodplanks_stairways
-  - type: FloorTile
-    placeTileSound:
-      path: /Audio/Effects/woodenclosetclose.ogg
-      params:
-        variation: 0.03
-        volume: 2
-    outputs:
-      - CP14FloorBirchWoodPlanksStairways
-  - type: Stack
-    stackType: CP14FloorTileBirchWoodplanksStairs
+    stackType: CP14FloorTileStonebricksSquareCarved

Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml

@@ -2,9 +2,8 @@
   parent: BaseStructure
   id: CP14FloorWaterOptimized
   name: water
-  suffix: Optimized, Empty
   description: A trough of plain water. Clean enough for consumption
-  categories: [ ForkFiltered ]
+  categories: [ HideSpawnMenu ]
   placement:
     mode: SnapgridCenter
     snap:
@@ -62,29 +61,11 @@
   - type: TileEntityEffect
     effects:
     - !type:ExtinguishReaction
-  - type: FrictionContacts
-
-- type: entity
-  parent: CP14FloorWaterOptimized
-  id: CP14FloorWaterOptimizedDeep
-  name: deep water
-  suffix: Deep, Air damage
-  components:
-  - type: Sprite
-    color: "#869dc2"
-  - type: SpeedModifierContacts
-    walkSpeedModifier: 0.2
-    sprintSpeedModifier: 0.2
-  - type: FrictionContacts
-  - type: DamageContacts
-    damage:
-      types:
-        Asphyxiation: 2.5
 
 - type: entity
   parent: CP14FloorWaterOptimized
   id: CP14FloorWater
-  suffix: Normal
+  categories: [ ForkFiltered ]
   components:
   - type: DrawableSolution
     solution: pool

Resources/Prototypes/_CP14/Entities/Structures/Flora/trees.yml

@@ -24,7 +24,7 @@
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.2,-0.2,0.2,0.2"
+          bounds: "-0.35,-0.4,0.35,0.4"
         density: 1000
         layer:
         - WallLayer
@@ -82,6 +82,15 @@
   components:
   - type: Sprite
     offset: 0,1.55
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.18,-0.35,0.18,0.35"
+        density: 2000
+        layer:
+        - WallLayer
   - type: Destructible
     thresholds:
     - trigger:
@@ -139,7 +148,7 @@
   id: CP14FloraTreeSnow
   components:
   - type: Sprite
-    sprite: _CP14/Structures/Flora/tree_snow.rsi
+    sprite: _CP14/Structures/Flora/snow_trees.rsi
     layers:
     - state: tree01
       map: ["random"]
@@ -247,6 +256,15 @@
     - random:
         tree01: ""
         tree02: ""
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.18,-0.35,0.18,0.35"
+        density: 2000
+        layer:
+        - WallLayer
   - type: Destructible
     thresholds:
     - trigger:
@@ -279,151 +297,3 @@
           CP14LucensWoodLog:
             min: 3
             max: 6
-
-- type: entity
-  parent: CP14BaseTree
-  id: CP14FloraTreeBirchSmall
-  suffix: Small
-  components:
-  - type: Sprite
-    offset: 0,1.3
-    sprite: _CP14/Structures/Flora/tree_birch_small.rsi
-    layers:
-    - state: tree01
-      map: ["random"]
-  - type: RandomSprite
-    available:
-    - random:
-        tree01: ""
-        tree02: ""
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 100
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 75
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/tree_fell.ogg
-          params:
-            volume: 5
-            variation: 0.05
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          CP14BirchWoodLog:
-            min: 1
-            max: 2
-
-- type: entity
-  parent: CP14BaseTree
-  id: CP14FloraTreeBirchMedium
-  suffix: Medium
-  components:
-  - type: Sprite
-    offset: 0,1.8
-    sprite: _CP14/Structures/Flora/tree_birch_medium.rsi
-    layers:
-    - state: tree01
-      map: ["random"]
-  - type: RandomSprite
-    available:
-    - random:
-        tree01: ""
-        tree02: ""
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 100
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 75
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/tree_fell.ogg
-          params:
-            volume: 5
-            variation: 0.05
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          CP14BirchWoodLog:
-            min: 2
-            max: 4
-
-- type: entity
-  parent: CP14BaseTree
-  id: CP14FloraTreeBirchLarge
-  suffix: Large
-  components:
-  - type: Sprite
-    offset: 0,2.6
-    sprite: _CP14/Structures/Flora/tree_birch_big.rsi
-    layers:
-    - state: tree01
-      map: ["random"]
-  - type: RandomSprite
-    available:
-    - random:
-        tree01: ""
-        tree02: ""
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 100
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 75
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/tree_fell.ogg
-          params:
-            volume: 5
-            variation: 0.05
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          CP14BirchWoodLog:
-            min: 3
-            max: 6
-

Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml

@@ -1,8 +1,7 @@
 - type: entity
   parent:
   - BaseStructure
-  - CP14BaseFlammable
-  id: CP14WoodenTableBase
+  id: CP14TableBase
   categories: [ ForkFiltered ]
   abstract: true
   components:
@@ -17,6 +16,31 @@
         - TableMask
         layer:
         - TableLayer
+  - type: Damageable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/picaxe2.ogg
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepHull
+  - type: Climbable
+  - type: PlaceableSurface
+
+- type: entity
+  parent:
+  - CP14TableBase
+  - CP14BaseFlammable
+  id: CP14WoodenTableBase
+  abstract: true
+  components:
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
@@ -52,8 +76,6 @@
   - type: FireVisuals
     sprite: _CP14/Effects/fire.rsi
     normalState: full
-  - type: Climbable
-  - type: PlaceableSurface
 
 - type: entity
   parent: CP14WoodenTableBase
@@ -116,4 +138,25 @@
     state: full
   - type: Construction
     graph: CP14TableWoodenCounter
-    node: CP14TableWoodenCounter
+    node: CP14TableWoodenCounter
+
+- type: entity
+  parent: CP14TableBase
+  id: CP14TableMarble
+  name: marble table
+  description: Exquisite white marble table.
+  components:
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Metallic
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Tables/marble.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Tables/marble.rsi
+    state: full
+  - type: IconSmooth
+    key: state
+    base: state
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepFloor

Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml

@@ -38,6 +38,39 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
 
+- type: entity
+  id: CP14WallMarbleStone
+  name: marble
+  parent: CP14WallStone
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Walls/Natural/marble_stone.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 350
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14MarbleBlock1:
+            min: 2
+            max: 3
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
 
 - type: entity
   id: CP14WallStoneIndestructable

Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml

@@ -71,6 +71,25 @@
     sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi
   - type: IconSmooth
     base: stonebricks
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Rock
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/break_stone.ogg
+          params:
+            volume: -6
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: CP14WallMarbleBrick
+    node: CP14WallMarbleBrick
   - type: CP14WallpaperHolder
 
 - type: entity
@@ -128,18 +147,6 @@
     node: WallWooden
   - type: CP14WallpaperHolder
 
-- type: entity
-  id: CP14WallWoodenBirch
-  parent: CP14WallWooden
-  components:
-  - type: Sprite
-    sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi
-  - type: Icon
-    sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi
-  - type: Construction
-    graph: CP14WallWood
-    node: WallWoodenBirch
-
 - type: entity
   id: CP14WallWoodenPalisade
   name: palisade

Resources/Prototypes/_CP14/Maps/Factoria.yml

@@ -0,0 +1,54 @@
+- type: gameMap
+  id: Factoria
+  mapName: "Factoria"
+  mapPath: /Maps/_CP14/factoria.yml
+  maxRandomOffset: 0
+  randomRotation: false
+  minPlayers: 0
+  stations:
+    Factoria:
+      stationProto: CP14BaseExpedition
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: "Factoria"
+        - type: StationJobs
+          availableJobs:
+            #Mercenary
+            CP14Guildmaster: [1, 1]
+            CP14Adventurer: [ -1, -1 ]
+            #Artisans
+            CP14Apprentice: [ 5, 5 ]
+            CP14Alchemist: [ 2, 2 ]
+            CP14Blacksmith: [ 2, 2 ]
+            CP14Innkeeper: [ 3, 4 ]
+            CP14Merchant: [2, 2]
+            #Guard
+            CP14Guard: [8, 8]
+            CP14GuardCommander: [1, 1]
+        - type: CP14StationZLevels
+          defaultMapLevel: 0
+          levels:
+            -1:
+              path: /Maps/_CP14/factoria_d.yml
+        - type: CP14StationKeyDistribution
+          keys:
+          - Alchemy1
+          - Alchemy2
+          - Blacksmith1
+          - Blacksmith2
+          - PersonalHouse1
+          - PersonalHouse2
+          - PersonalHouse3
+          - PersonalHouse4
+          - PersonalHouse5
+          - PersonalHouse6
+          - PersonalHouse7
+          - PersonalHouse8
+          - PersonalHouse9
+          - PersonalHouse10
+          - PersonalHouse11
+          - PersonalHouse12
+          - PersonalHouse13
+          - PersonalHouse14
+          - PersonalHouse15
+          - PersonalHouse16

Resources/Prototypes/_CP14/Materials/simple.yml

@@ -25,6 +25,15 @@
   color: "#555963"
   price: 0
 
+- type: material
+  id: CP14MarbleStone
+  stackEntity: CP14MarbleBlock1
+  name: cp14-material-stone-block #TODO
+  unit: materials-unit-chunk
+  icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 }
+  color: "#555963"
+  price: 0
+
 - type: material
   id: CP14Nail
   stackEntity: CP14Nail1
@@ -84,7 +93,7 @@
   stackEntity: CP14LucensWoodenPlanks1
   name: cp14-material-lucens-planks
   unit: materials-unit-bar
-  icon: { sprite: _CP14/Objects/Materials/wood_lucens.rsi, state: planks_2 }
+  icon: { sprite: _CP14/Objects/Materials/lucens_wood.rsi, state: planks_2 }
   color: "#1a1e22"
   price: 0
 

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t2_magma_caves.yml

@@ -41,6 +41,10 @@
       biomeTemplate: CP14CavesFloor
       tileMask:
       - CP14FloorGrass
+    - !type:BiomeDunGen
+      biomeTemplate: CP14MarbleCaves
+      tileMask:
+      - CP14FloorMarble
 
 - type: dungeonConfig
   id: CP14DemiplaneCavesRingFloorMaskStone
@@ -102,9 +106,9 @@
   - !type:NoiseDistanceDunGen
     size: 50, 50
     distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.6
+      blendWeight: 0.8
     layers:
-    - tile: Space
+    - tile: CP14FloorMarble
       threshold: 0.50
       noise:
         frequency: 0.010
@@ -112,18 +116,4 @@
         fractalType: FBm
         octaves: 5
         lacunarity: 2
-        gain: 0.5
-  - !type:NoiseDistanceDunGen
-    size: 80, 50
-    distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.2
-    layers:
-    - tile: Space
-      threshold: 0.50
-      noise:
-        frequency: 0.08
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        octaves: 5
-        lacunarity: 2
         gain: 0.5

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml

@@ -220,7 +220,7 @@
   - CP14DemiplaneHot
   layers:
     - !type:OreDunGen
-      entity: CP14MobWatcherIce
+      entity: CP14MobSlimeBase
       count: 2
       minGroupSize: 2
       maxGroupSize: 3
@@ -239,7 +239,7 @@
   - CP14DemiplaneCold
   layers:
     - !type:OreDunGen
-      entity: CP14MobWatcherMagma
+      entity: CP14MobSlimeBase
       count: 2
       minGroupSize: 2
       maxGroupSize: 3

Resources/Prototypes/_CP14/Procedural/fill.yml

@@ -48,7 +48,7 @@
       allowedTiles:
         - FloorSnow
       entities:
-        - CP14FloorWaterOptimizedDeep
+        - CP14FloorWaterOptimized
 
 - type: biomeTemplate
   id: CP14SandOceanFill
@@ -61,7 +61,7 @@
       allowedTiles:
         - FloorDesert
       entities:
-        - CP14FloorWaterOptimizedDeep
+        - CP14FloorWaterOptimized
 
 - type: biomeTemplate
   id: CP14LavaOceanFill

Resources/Prototypes/_CP14/Procedural/grasslands.yml

@@ -126,12 +126,8 @@
         - CP14FloorGrassLight
         - CP14FloorGrassTall
       entities: 
-        - CP14FloraTreeGreen
         - CP14FloraTreeGreen
         - CP14FloraTreeGreenLarge
-        - CP14FloraTreeBirchSmall
-        - CP14FloraTreeBirchMedium
-        - CP14FloraTreeBirchLarge
     - !type:BiomeEntityLayer # More Rocks
       threshold: 0.7
       noise:
@@ -178,12 +174,8 @@
         - CP14FloorGrassLight
         - CP14FloorGrassTall
       entities:
-        - CP14FloraTreeGreen
         - CP14FloraTreeGreen
         - CP14FloraTreeGreenLarge
-        - CP14FloraTreeBirchSmall
-        - CP14FloraTreeBirchMedium
-        - CP14FloraTreeBirchLarge
 
 - type: biomeTemplate
   id: CP14GrasslandHills # Холмы

Resources/Prototypes/_CP14/Procedural/marble_cave.yml

@@ -0,0 +1,47 @@
+- type: biomeTemplate
+  id: CP14MarbleCaves
+  layers:
+    - !type:BiomeTileLayer
+      threshold: -1.0
+      tile: CP14FloorMarbleCave
+    #Rocks
+    - !type:BiomeEntityLayer
+      threshold: 0.4
+      noise:
+        seed: 1
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 2
+      allowedTiles:
+        - CP14FloorMarbleCave
+      entities:
+        - CP14RockSmall
+    # Lakes
+    - !type:BiomeEntityLayer
+      threshold: -0.45
+      invert: true
+      noise:
+        seed: 12
+        noiseType: Perlin
+        fractalType: Ridged
+        octaves: 1
+        frequency: 0.1
+        gain: 0.5
+      allowedTiles:
+        - CP14FloorMarbleCave
+      entities:
+        - CP14FloorLava
+    - !type:BiomeEntityLayer
+      threshold: -0.45
+      invert: true
+      noise:
+        seed: 0
+        noiseType: Perlin
+        fractalType: Ridged
+        octaves: 1
+        frequency: 0.1
+        gain: 0.5
+      allowedTiles:
+        - CP14FloorMarbleCave
+      entities:
+        - CP14WallMarbleStone

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/beds.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14WoodenBed
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
             - material: CP14Cloth
               amount: 1

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/cabinets.yml

@@ -8,7 +8,7 @@
           completed:
             - !type:SnapToGrid
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
             - material: CP14Nail
               amount: 2

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/closets.yml

@@ -8,7 +8,7 @@
           completed:
             - !type:SnapToGrid
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 4
             - material: CP14Nail
               amount: 2

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/curtains.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14CurtainsWhite
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 1
               doAfter: 2
             - material: CP14Nail

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/lighting.yml

@@ -11,7 +11,7 @@
             - material: CP14Stone
               amount: 3
               doAfter: 2
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
 

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/mannequin.yml

@@ -10,7 +10,7 @@
           completed:
             - !type:SnapToGrid { }
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 5
               doAfter: 3
     - node: CP14mannequin

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14WallmountOrdersBorder
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 3
 

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/seats.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14ChairWooden
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
     - node: CP14ChairWooden
@@ -24,7 +24,7 @@
       edges:
         - to: CP14BenchWood
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 2
     - node: CP14BenchWood

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14TableWooden
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 2
     - node: CP14TableWooden
@@ -24,7 +24,7 @@
       edges:
         - to: CP14TableWoodenRound
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 2
     - node: CP14TableWoodenRound
@@ -40,7 +40,7 @@
       edges:
         - to: CP14TableWoodenCounter
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 2
     - node: CP14TableWoodenCounter
@@ -56,7 +56,7 @@
       edges:
         - to: CP14Workbench
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 2
     - node: CP14Workbench
@@ -72,7 +72,7 @@
       edges:
         - to: CP14WorkbenchCooking
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 2
     - node: CP14WorkbenchCooking
@@ -88,7 +88,7 @@
       edges:
         - to: CP14WorkbenchSewing
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 2
     - node: CP14WorkbenchSewing

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/pallets.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14WoodenPallet
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
     - node: CP14WoodenPallet

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Misc/target.yml

@@ -9,7 +9,7 @@
             - !type:SnapToGrid
               southRotation: true
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
 
@@ -18,13 +18,16 @@
       edges:
         - to: start
           completed:
+            - !type:GivePrototype
+              prototype: CP14WoodenPlanks1
+              amount: 2
             - !type:DeleteEntity {}
           steps:
             - tool: Screwing
               doAfter: 1
         - to: CP14target
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 1
             - material: CP14Nail
@@ -61,7 +64,7 @@
           completed:
             - !type:SnapToGrid
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 5
             - material: CP14Cloth
               amount: 2

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/barrels.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14BaseBarrel
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 5
               doAfter: 3
             - material: CP14Nail
@@ -27,7 +27,7 @@
       edges:
         - to: CP14CraneBarrel
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 5
               doAfter: 3
             - material: CP14Nail
@@ -46,7 +46,7 @@
       edges:
         - to: CP14CraneBarrelSmall
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 3
             - material: CP14Nail

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/chests.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14WoodenChestFrame
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
               
@@ -17,7 +17,7 @@
       edges:
         - to: CP14WoodenChest
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
             - material: CP14Nail

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml

@@ -8,7 +8,7 @@
           completed:
             - !type:SnapToGrid
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
             - material: CP14Cloth
               amount: 2

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/crates.yml

@@ -8,7 +8,7 @@
           completed:
             - !type:SnapToGrid
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
             - material: CP14Nail
               amount: 1
@@ -26,7 +26,7 @@
           completed:
             - !type:SnapToGrid
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 4
             - material: CP14Nail
               amount: 2

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14WoodenDoorFrame
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
               
@@ -30,7 +30,7 @@
               doAfter: 1
         - to: CP14WoodenDoor
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
         - to: CP14WoodenDoorWindowed
@@ -47,6 +47,9 @@
       edges:
         - to: start
           completed:
+            - !type:SpawnPrototype
+              prototype: CP14WoodenPlanks1
+              amount: 2
             - !type:DeleteEntity {}
           steps:
             - tool: Prying #TODO - new tool
@@ -73,6 +76,10 @@
       entity: CP14WoodenDoor
       edges:
         - to: CP14WoodenDoorFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: CP14WoodenPlanks1
+              amount: 2
           steps:
             - tool: Prying #TODO - new tool
               doAfter: 5
@@ -81,6 +88,10 @@
       entity: CP14WoodenDoorMirrored
       edges:
         - to: CP14WoodenDoorFrameMirrored
+          completed:
+            - !type:SpawnPrototype
+              prototype: CP14WoodenPlanks1
+              amount: 2
           steps:
             - tool: Prying #TODO - new tool
               doAfter: 5
@@ -89,6 +100,10 @@
       entity: CP14WoodenDoorWindowed
       edges:
         - to: CP14WoodenDoorFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: CP14WoodenPlanks1
+              amount: 2
           steps:
             - tool: Prying #TODO - new tool
               doAfter: 5
@@ -97,6 +112,10 @@
       entity: CP14WoodenDoorWindowedMirrored
       edges:
         - to: CP14WoodenDoorFrameMirrored
+          completed:
+            - !type:SpawnPrototype
+              prototype: CP14WoodenPlanks1
+              amount: 2
           steps:
             - tool: Prying #TODO - new tool
               doAfter: 5

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Fence/wooden_fence.yml

@@ -8,32 +8,32 @@
       edges:
         - to: CP14FenceWoodSmallStraight
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
         - to: CP14FenceWoodSmallCorner
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
         - to: CP14FenceWoodSmallGate
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
         - to: CP14FenceWoodStraight
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 4
               doAfter: 2
         - to: CP14FenceWoodCorner
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 4
               doAfter: 2
         - to: CP14FenceWoodGate
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 4
               doAfter: 2
               

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Roofs/roofs.yml

@@ -6,7 +6,7 @@
       edges:
         - to: CP14RoofWooden
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
       

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/lighting.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14WallmountTorch
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 3
               doAfter: 3
             - material: CP14Cloth

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Wallmount/shelfs.yml

@@ -8,7 +8,7 @@
       edges:
         - to: CP14WallmountBarShelfA
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
     - node: CP14WallmountBarShelfA
@@ -24,7 +24,7 @@
       edges:
         - to: CP14WallmountBarShelfB
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
     - node: CP14WallmountBarShelfB

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml

@@ -0,0 +1,16 @@
+- type: constructionGraph
+  id: CP14WallMarbleBrick
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: CP14WallMarbleBrick
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: CP14MarbleStone
+              amount: 3
+              doAfter: 2
+    - node: CP14WallMarbleBrick
+      entity: CP14WallMarbleBrick

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml

@@ -9,7 +9,7 @@
             - !type:SnapToGrid
               southRotation: true
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 2
               doAfter: 2
 
@@ -35,16 +35,6 @@
               doAfter: 1
             - tool: CP14Hammering
               doAfter: 2
-        - to: WallWoodenBirch
-          steps:
-            - material: CP14BirchWoodenPlanks
-              amount: 2
-              doAfter: 1
-            - material: CP14Nail
-              amount: 2
-              doAfter: 1
-            - tool: CP14Hammering
-              doAfter: 2
         - to: WindowWooden
           steps:
             - material: CP14GlassSheet
@@ -59,14 +49,6 @@
             - tool: CP14Hammering
               doAfter: 2
               
-    - node: WallWoodenBirch
-      entity: CP14WallWoodenBirch
-      edges:
-        - to: FrameWooden
-          steps:
-            - tool: CP14Hammering
-              doAfter: 2
-              
     - node: WindowWooden
       entity: CP14WindowWooden
 
@@ -81,7 +63,7 @@
           completed:
             - !type:SnapToGrid
           steps:
-            - stackGroup: WoodenPlanks
+            - material: CP14WoodenPlanks
               amount: 4
               doAfter: 2
     - node: CP14WallWoodenPalisade

Resources/Prototypes/_CP14/Recipes/Construction/walls.yml

@@ -16,24 +16,6 @@
   conditions:
     - !type:TileNotBlocked
 
-- type: construction
-  crystallPunkAllowed: true
-  name: wooden birch wall
-  description: Sturdy enough to cover you from threats or cold winds.
-  id: CP14WoodenWallBirch
-  graph: CP14WallWood
-  startNode: start
-  targetNode: WallWoodenBirch
-  category: construction-category-structures
-  icon:
-    sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi
-    state: full
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
-
 - type: construction
   crystallPunkAllowed: true
   name: palisade
@@ -90,7 +72,7 @@
 
 - type: construction
   crystallPunkAllowed: true
-  name: stone wall
+  name: stonebrick wall
   description: Sturdy enough to cover you from threats or cold winds.
   id: CP14WallStonebrick
   graph: CP14WallStonebrick
@@ -106,6 +88,24 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  crystallPunkAllowed: true
+  name: marble brick wall
+  description: Sturdy enough to cover you from threats or cold winds.
+  id: CP14WallMarbleBrick
+  graph: CP14WallMarbleBrick
+  startNode: start
+  targetNode: CP14WallMarbleBrick
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   crystallPunkAllowed: true
   name: iron grille

Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml

@@ -3,8 +3,8 @@
   tag: CP14RecipeWorkbench
   craftTime: 2
   requirements:
-  - !type:StackGroupResource
-    group: WoodenPlanks
+  - !type:StackResource
+    stack: CP14WoodenPlanks
     count: 3
   - !type:ProtoIdResource
     protoId: CP14Rope
@@ -16,8 +16,8 @@
   tag: CP14RecipeWorkbench
   craftTime: 3
   requirements:
-  - !type:StackGroupResource
-    group: WoodenPlanks
+  - !type:StackResource
+    stack: CP14WoodenPlanks
     count: 2
   - !type:StackResource
     stack: CP14Nail
@@ -29,8 +29,8 @@
   tag: CP14RecipeWorkbench
   craftTime: 3
   requirements:
-  - !type:StackGroupResource
-    group: WoodenPlanks
+  - !type:StackResource
+    stack: CP14WoodenPlanks
     count: 2
   result: CP14SmokingPipe
 
@@ -39,8 +39,8 @@
   tag: CP14RecipeWorkbench
   craftTime: 3
   requirements:
-  - !type:StackGroupResource
-    group: WoodenPlanks
+  - !type:StackResource
+    stack: CP14WoodenPlanks
     count: 2
   result: CP14Plate
 
@@ -49,8 +49,8 @@
   tag: CP14RecipeWorkbench
   craftTime: 3
   requirements:
-  - !type:StackGroupResource
-    group: WoodenPlanks
+  - !type:StackResource
+    stack: CP14WoodenPlanks
     count: 2
   - !type:StackResource
     stack: CP14Cloth
@@ -115,8 +115,8 @@
   tag: CP14RecipeWorkbench
   craftTime: 2
   requirements:
-  - !type:StackGroupResource
-    group: WoodenPlanks
+  - !type:StackResource
+    stack: CP14WoodenPlanks
     count: 4
   - !type:ProtoIdResource
     protoId: CP14String
@@ -150,8 +150,8 @@
   tag: CP14RecipeWorkbench
   craftTime: 1
   requirements:
-  - !type:StackGroupResource
-    group: WoodenPlanks
+  - !type:StackResource
+    stack: CP14WoodenPlanks
   - !type:ProtoIdResource
     protoId: CP14CrystalShardBase
   result: CP14CrayonWhite

Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/tile.yml

@@ -15,11 +15,22 @@
   craftTime: 1
   requirements:
   - !type:StackResource
-    stack: CP14Stone
+    stack: CP14MarbleStone
     count: 1
   result: CP14FloorTileMarbleBrick
   resultCount: 4
 
+- type: CP14Recipe
+  id: CP14FloorTileMarbleSmallbricks
+  tag: CP14RecipeWorkbench
+  craftTime: 1
+  requirements:
+  - !type:StackResource
+    stack: CP14MarbleStone
+    count: 1
+  result: CP14FloorTileMarbleSmallbricks
+  resultCount: 4
+
 - type: CP14Recipe
   id: CP14FloorTileStonebricks
   tag: CP14RecipeWorkbench
@@ -106,48 +117,4 @@
     stack: CP14WoodenPlanks
     count: 1
   result: CP14FloorTileOakWoodplanksStairs
-  resultCount: 4
-
-- type: CP14Recipe
-  id: CP14FloorTileBirchWoodplanks
-  tag: CP14RecipeWorkbench
-  craftTime: 1
-  requirements:
-  - !type:StackResource
-    stack: CP14BirchWoodenPlanks
-    count: 1
-  result: CP14FloorTileBirchWoodplanks
-  resultCount: 4
-
-- type: CP14Recipe
-  id: CP14FloorTileBirchWoodplanksBig
-  tag: CP14RecipeWorkbench
-  craftTime: 1
-  requirements:
-  - !type:StackResource
-    stack: CP14BirchWoodenPlanks
-    count: 1
-  result: CP14FloorTileBirchWoodplanksBig
-  resultCount: 4
-
-- type: CP14Recipe
-  id: CP14FloorTileBirchWoodplanksCruciform
-  tag: CP14RecipeWorkbench
-  craftTime: 1
-  requirements:
-  - !type:StackResource
-    stack: CP14BirchWoodenPlanks
-    count: 1
-  result: CP14FloorTileBirchWoodplanksCruciform
-  resultCount: 4
-
-- type: CP14Recipe
-  id: CP14FloorTileBirchWoodplanksStairs
-  tag: CP14RecipeWorkbench
-  craftTime: 1
-  requirements:
-  - !type:StackResource
-    stack: CP14BirchWoodenPlanks
-    count: 1
-  result: CP14FloorTileBirchWoodplanksStairs
   resultCount: 4

Resources/Prototypes/_CP14/Species/silva.yml

@@ -10,7 +10,6 @@
   defaultSkinTone: "#6c741d"
   maleFirstNames: CP14_Names_Silva_Male_First
   femaleFirstNames: CP14_Names_Silva_Female_First
-  naming: First
 
 - type: speciesBaseSprites
   id: CP14MobSilvaSprites

Resources/Prototypes/_CP14/Stacks/floor_tile_stacks.yml

@@ -12,6 +12,13 @@
   icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble }
   maxCount: 30
 
+- type: stack
+  id: CP14FloorTileMarbleSmallbricks
+  name: marble small brick
+  spawn: CP14FloorTileMarbleSmallbricks
+  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: marble_smallbricks }
+  maxCount: 30
+
 - type: stack
   id: CP14FloorTileOakWoodplanks
   name: oak woodplanks
@@ -66,32 +73,4 @@
   name: square carved stonebricks
   spawn: CP14FloorTileStonebricksSquareCarved
   icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: stonebrick_square_carved }
-  maxCount: 30
-
-- type: stack
-  id: CP14FloorTileBirchWoodplanks
-  name: birch woodplanks
-  spawn: CP14FloorTileOakWoodplanks
-  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks }
-  maxCount: 30
-
-- type: stack
-  id: CP14FloorTileBirchWoodplanksBig
-  name: birch big woodplanks
-  spawn: CP14FloorTileBirchWoodplanksBig
-  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks_big }
-  maxCount: 30
-
-- type: stack
-  id: CP14FloorTileBirchWoodplanksCruciform
-  name: birch cruciform woodplanks
-  spawn: CP14FloorTileBirchWoodplanksCruciform
-  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks_cruciform }
-  maxCount: 30
-
-- type: stack
-  id: CP14FloorTileBirchWoodplanksStairs
-  name: birch stairs woodplanks
-  spawn: CP14FloorTileBirchWoodplanksStairs
-  icon: { sprite: _CP14/Objects/Tile/tile.rsi, state: birch_woodplanks_stairways }
   maxCount: 30

Resources/Prototypes/_CP14/Stacks/materials.yml

@@ -12,6 +12,13 @@
   icon: { sprite: _CP14/Objects/Materials/stone_block.rsi, state: stone_2 }
   maxCount: 10
 
+- type: stack
+  id: CP14MarbleStone
+  name: cp14-stack-marble-block
+  spawn: CP14MarbleBlock1
+  icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 }
+  maxCount: 10
+
 - type: stack
   id: CP14WoodenPlanks
   name: cp14-stack-wood-planks
@@ -19,20 +26,6 @@
   icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 }
   maxCount: 20
 
-- type: stack
-  id: CP14BirchWoodenPlanks
-  name: cp14-stack-wood-planks-birch
-  spawn: CP14BirchWoodenPlanks1
-  icon: { sprite: _CP14/Objects/Materials/wood_birch.rsi, state: planks_2 }
-  maxCount: 20
-
-- type: stack
-  id: CP14LucensWoodenPlanks
-  name: cp14-material-lucens-planks
-  spawn: CP14LucensWoodenPlanks1
-  icon: { sprite: _CP14/Objects/Materials/wood_lucens.rsi, state: planks_2 }
-  maxCount: 20
-
 - type: stack
   id: CP14Nail
   name: cp14-stack-nails
@@ -75,6 +68,13 @@
   icon: { sprite: _CP14/Objects/Materials/mithril_bar.rsi, state: bar_2 }
   maxCount: 10
 
+- type: stack
+  id: CP14LucensWoodenPlanks
+  name: cp14-material-lucens-planks
+  spawn: CP14LucensWoodenPlanks1
+  icon: { sprite: _CP14/Objects/Materials/lucens_wood.rsi, state: planks_2 }
+  maxCount: 20
+
 - type: stack
   id: CP14GlassSheet
   name: cp14-stack-glass-sheet

Resources/Prototypes/_CP14/Stacks/stack_groups.yml

@@ -1,7 +0,0 @@
-- type: CP14StackGroup
-  id: WoodenPlanks
-  name: cp14-stack-group-wooden-planks-any
-  stacks:
-  - CP14WoodenPlanks
-  - CP14BirchWoodenPlanks
-  - CP14LucensWoodenPlanks

Resources/Prototypes/_CP14/Tiles/natural.yml

@@ -40,6 +40,37 @@
   heatCapacity: 10000
   weather: true
 
+- type: tile
+  editorHidden: false
+  id: CP14FloorMarbleCave
+  name: cp14-tiles-marble-cave
+  sprite: /Textures/_CP14/Tiles/marble_cave.png
+  variants: 14
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: CP14FloorBase
+  deconstructTools: [ CP14Digging ]
+  isSubfloor: true
+  itemDrop: CP14MarbleBlock1
+  footstepSounds:
+    collection: FootstepAsteroid
+  heatCapacity: 10000
+  weather: true
+  indestructible: true
+
 - type: tile
   editorHidden: false
   id: CP14FloorSand

Resources/Prototypes/_CP14/Tiles/produced.yml

@@ -205,6 +205,34 @@
   deconstructTools: [ Prying ]
   itemDrop: CP14FloorTileMarbleBrick
 
+- type: tile
+  editorHidden: false
+  id: CP14FloorMarbleSmallbricks
+  name: cp14-tiles-stonebricks-marble
+  sprite: /Textures/_CP14/Tiles/Marble/small_bricks.png
+  variants: 9
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  edgeSpritePriority: 102
+  edgeSprites:
+    South: /Textures/_CP14/Tiles/Marble/double_edge_S.png
+  baseTurf: CP14FloorFoundation
+  isSubfloor: false
+  footstepSounds:
+    collection: FootstepAsteroid
+  heatCapacity: 10000
+  weather: true
+  deconstructTools: [ Prying ]
+  itemDrop: CP14FloorTileMarbleSmallbricks
+
 - type: tile
   editorHidden: false
   id: CP14FloorDirtSeedbed

Resources/Prototypes/_CP14/Tiles/woodplanks.yml

@@ -276,7 +276,7 @@
   baseTurf: CP14FloorFoundation
   isSubfloor: false
   deconstructTools: [ Prying ]
-  itemDrop: CP14FloorTileBirchWoodplanks
+  itemDrop: CP14WoodenPlanks1
   footstepSounds:
     collection: FootstepWood
   heatCapacity: 10000
@@ -307,7 +307,7 @@
   baseTurf: CP14FloorFoundation
   isSubfloor: false
   deconstructTools: [ Prying ]
-  itemDrop: CP14FloorTileBirchWoodplanksBig
+  itemDrop: CP14WoodenPlanks1
   footstepSounds:
     collection: FootstepWood
   heatCapacity: 10000
@@ -338,7 +338,7 @@
   baseTurf: CP14FloorFoundation
   isSubfloor: false
   deconstructTools: [ Prying ]
-  itemDrop: CP14FloorTileBirchWoodplanksCruciform
+  itemDrop: CP14WoodenPlanks1
   footstepSounds:
     collection: FootstepWood
   heatCapacity: 10000
@@ -369,7 +369,7 @@
   baseTurf: CP14FloorFoundation
   isSubfloor: false
   deconstructTools: [ Prying ]
-  itemDrop: CP14FloorTileBirchWoodplanksStairs
+  itemDrop: CP14WoodenPlanks1
   footstepSounds:
     collection: FootstepWood
   heatCapacity: 10000