small optimizations

* snowdrifts

* Update fire.png

* alerts sprite optimize

* Update wooden.png

* stone wall fix

Content.Server/_CP14/Footprints/CP14FootprintsSystem.cs

@@ -1,178 +0,0 @@
-using System.Numerics;
-using Content.Server._CP14.Footprints.Components;
-using Content.Server.Decals;
-using Content.Shared._CP14.Decals;
-using Content.Shared.DoAfter;
-using Content.Shared.Fluids;
-using Content.Shared.Fluids.Components;
-using Content.Shared.Interaction;
-using Content.Shared.Inventory.Events;
-using Content.Shared.Maps;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics.Events;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server._CP14.Footprints;
-
-public sealed class CP14FootprintsSystem : EntitySystem
-{
-    [Dependency] private readonly DecalSystem _decal = default!;
-    [Dependency] private readonly SharedMapSystem _maps = default!;
-    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CP14FootprintTrailerComponent, MoveEvent>(OnTrailerMove);
-        SubscribeLocalEvent<CP14FootprintTrailerComponent, StartCollideEvent>(OnTrailerCollide);
-
-        SubscribeLocalEvent<CP14FootprintHolderComponent, GotEquippedEvent>(OnHolderEquipped);
-        SubscribeLocalEvent<CP14FootprintHolderComponent, GotUnequippedEvent>(OnHolderUnequipped);
-
-        SubscribeLocalEvent<CP14DecalCleanerComponent, AfterInteractEvent>(OnAfterInteract);
-        SubscribeLocalEvent<CP14DecalCleanerComponent, CP14DecalCleanerDoAfterEvent>(OnCleanDoAfter);
-    }
-
-    private void OnCleanDoAfter(Entity<CP14DecalCleanerComponent> ent, ref CP14DecalCleanerDoAfterEvent args)
-    {
-        if (args.Cancelled || args.Handled)
-            return;
-
-        var gridUid = Transform(ent).GridUid;
-        if (gridUid is null)
-            return;
-
-        if (!TryComp<MapGridComponent>(gridUid, out var map))
-            return;
-
-        var coord = EntityManager.GetCoordinates(args.ClickLocation);
-        _audio.PlayPvs(ent.Comp.Sound, coord);
-        SpawnAtPosition(ent.Comp.SpawnEffect, coord);
-
-        var oldDecals = _decal.GetDecalsInRange(gridUid.Value, args.ClickLocation.Position, ent.Comp.Range);
-        foreach (var (id, decal) in oldDecals)
-        {
-            if (decal.Cleanable)
-                _decal.RemoveDecal(gridUid.Value, id);
-        }
-
-        args.Handled = true;
-    }
-
-    private void OnAfterInteract(Entity<CP14DecalCleanerComponent> ent, ref AfterInteractEvent args)
-    {
-        if (!args.CanReach && !args.Handled)
-            return;
-
-        var doAfter = new DoAfterArgs(EntityManager,
-            args.User,
-            ent.Comp.Delay,
-            new CP14DecalCleanerDoAfterEvent(EntityManager.GetNetCoordinates(args.ClickLocation)),
-            ent)
-        {
-            BreakOnMove = true,
-            BreakOnDamage = true,
-            NeedHand = true,
-        };
-        _doAfter.TryStartDoAfter(doAfter);
-
-        args.Handled = true;
-    }
-
-    private void OnHolderUnequipped(Entity<CP14FootprintHolderComponent> ent, ref GotUnequippedEvent args)
-    {
-        if (!TryComp<Components.CP14FootprintTrailerComponent>(args.Equipee, out var trailer))
-            return;
-
-        trailer.holder = null;
-
-        if (TryComp<CP14FootprintHolderComponent>(args.Equipee, out var selfHolder))
-        {
-            trailer.holder = selfHolder;
-        }
-    }
-
-    private void OnHolderEquipped(Entity<CP14FootprintHolderComponent> ent, ref GotEquippedEvent args)
-    {
-        if (!TryComp<Components.CP14FootprintTrailerComponent>(args.Equipee, out var trailer))
-            return;
-
-        trailer.holder = ent.Comp;
-    }
-
-    private void OnTrailerCollide(Entity<Components.CP14FootprintTrailerComponent> ent, ref StartCollideEvent args)
-    {
-        if (ent.Comp.holder is null)
-            return;
-        var footprint = ent.Comp.holder;
-
-        if (!TryComp<PuddleComponent>(args.OtherEntity, out var puddle))
-            return;
-
-        if (puddle.Solution is null)
-            return;
-
-        var sol = puddle.Solution;
-
-        var splittedSol = sol.Value.Comp.Solution.SplitSolutionWithout(footprint.PickSolution, SharedPuddleSystem.EvaporationReagents);
-
-        if (splittedSol.Volume > 0)
-            UpdateFootprint(footprint, splittedSol.GetColor(_proto));
-    }
-
-    private void UpdateFootprint(CP14FootprintHolderComponent comp, Color color)
-    {
-        comp.DecalColor = color;
-        comp.Intensity = 1f;
-    }
-
-    private void OnTrailerMove(Entity<Components.CP14FootprintTrailerComponent> ent, ref MoveEvent args)
-    {
-        //Temporaly disabled
-        return;
-
-        if (ent.Comp.holder is null)
-            return;
-        var footprint = ent.Comp.holder;
-
-        var distance = Vector2.Distance(args.OldPosition.Position, args.NewPosition.Position);
-
-        footprint.DistanceTraveled += distance;
-
-        if (footprint.DistanceTraveled < footprint.DecalDistance)
-            return;
-
-        footprint.DistanceTraveled = 0f;
-
-        var xform = Transform(ent);
-        if (!TryComp<MapGridComponent>(xform.GridUid, out var mapGrid))
-            return;
-
-        var tileRef = _maps.GetTileRef(xform.GridUid.Value, mapGrid, xform.Coordinates);
-        var tileDef = (ContentTileDefinition)_tileDefManager[tileRef.Tile.TypeId];
-
-        if (tileDef.Weather && tileDef.Color is not null)
-        {
-            UpdateFootprint(footprint, tileDef.Color.Value);
-            return;
-        }
-
-        if (footprint.Intensity <= 0)
-            return;
-
-        _decal.TryAddDecal(footprint.DecalProto,
-            xform.Coordinates.Offset(new Vector2(-0.5f, -0.5f)),
-            out var decal,
-            footprint.DecalColor.WithAlpha(footprint.Intensity),
-            xform.LocalRotation,
-            cleanable: true);
-
-        footprint.Intensity = MathF.Max(0, footprint.Intensity - footprint.DistanceIntensityCost);
-    }
-}

Content.Server/_CP14/Footprints/Components/CP14DecalCleanerComponent.cs

@@ -1,26 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server._CP14.Footprints.Components;
-
-/// <summary>
-/// allows you to remove cleanable decals from tiles with a short delay.
-/// </summary>
-[RegisterComponent, Access(typeof(CP14FootprintsSystem))]
-public sealed partial class CP14DecalCleanerComponent : Component
-{
-    [DataField]
-    public SoundSpecifier Sound = new SoundCollectionSpecifier("CP14Broom")
-    {
-        Params = AudioParams.Default.WithVariation(0.2f),
-    };
-
-    [DataField]
-    public EntProtoId? SpawnEffect = "CP14DustEffect";
-
-    [DataField]
-    public float Range = 1.2f;
-
-    [DataField]
-    public TimeSpan Delay = TimeSpan.FromSeconds(0.75f);
-}

Content.Server/_CP14/Footprints/Components/CP14FootprintHolderComponent.cs

@@ -1,33 +0,0 @@
-using Content.Shared.Decals;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server._CP14.Footprints.Components;
-
-/// <summary>
-///  stores the type of footprints and their settings.
-/// </summary>
-[RegisterComponent, Access(typeof(CP14FootprintsSystem))]
-public sealed partial class CP14FootprintHolderComponent : Component
-{
-    [DataField]
-    public ProtoId<DecalPrototype> DecalProto = "CP14FootprintsBoots";
-
-    [DataField]
-    public float DecalDistance = 1f;
-
-    [DataField]
-    public float DistanceTraveled = 0f;
-
-    [DataField]
-    public Color DecalColor = Color.White;
-
-    [DataField]
-    public float Intensity = 0f;
-
-    [DataField]
-    public FixedPoint2 PickSolution = 1f;
-
-    [DataField]
-    public float DistanceIntensityCost = 0.2f;
-}

Content.Server/_CP14/Footprints/Components/CP14FootprintTrailerComponent.cs

@@ -1,14 +0,0 @@
-namespace Content.Server._CP14.Footprints.Components;
-
-/// <summary>
-///  allows an entity to leave footprints on the tiles
-/// </summary>
-[RegisterComponent, Access(typeof(CP14FootprintsSystem))]
-public sealed partial class CP14FootprintTrailerComponent : Component
-{
-    /// <summary>
-    /// Source and type of footprint
-    /// </summary>
-    [DataField]
-    public CP14FootprintHolderComponent? holder = null;
-}

Content.Server/_CP14/MapDamage/CP14MapDamageComponent.cs

@@ -15,7 +15,7 @@ public sealed partial class CP14MapDamageComponent : Component
     {
         DamageDict = new Dictionary<string, FixedPoint2>()
         {
-            {"Asphyxiation", 10}
+            {"Asphyxiation", 5}
         }
     };
 

Content.Server/_CP14/ModularCraft/Modifiers/AddSpellsToSpellStorage.cs

@@ -1,25 +0,0 @@
-using Content.Shared._CP14.ModularCraft;
-using Content.Shared._CP14.ModularCraft.Components;
-using Content.Shared._CP14.MagicSpellStorage;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server._CP14.ModularCraft.Modifiers;
-
-public sealed partial class AddSpellsToSpellStorage : CP14ModularCraftModifier
-{
-    [DataField]
-    public List<EntProtoId> Spells;
-
-    public override void Effect(EntityManager entManager, Entity<CP14ModularCraftStartPointComponent> start, Entity<CP14ModularCraftPartComponent>? part)
-    {
-        if (!entManager.TryGetComponent<CP14SpellStorageComponent>(start, out var storageComp))
-            return;
-
-        var spellStorageSystem = entManager.System<CP14SpellStorageSystem>();
-
-        foreach (var spell in Spells)
-        {
-            spellStorageSystem.TryAddSpellToStorage((start.Owner, storageComp), spell);
-        }
-    }
-}

Content.Server/_CP14/ModularCraft/Modifiers/EditManacostModify.cs

@@ -1,35 +0,0 @@
-using Content.Shared._CP14.ModularCraft;
-using Content.Shared._CP14.ModularCraft.Components;
-using Content.Shared._CP14.MagicManacostModify;
-using Content.Shared._CP14.MagicRitual.Prototypes;
-using Content.Shared.FixedPoint;
-using Content.Shared._CP14.MagicSpellStorage;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server._CP14.ModularCraft.Modifiers;
-
-public sealed partial class EditManacostModify : CP14ModularCraftModifier
-{
-    [DataField]
-    public Dictionary<ProtoId<CP14MagicTypePrototype>, FixedPoint2> Modifiers = new();
-    public override void Effect(EntityManager entManager, Entity<CP14ModularCraftStartPointComponent> start, Entity<CP14ModularCraftPartComponent>? part)
-    {
-        if (!entManager.TryGetComponent<CP14MagicManacostModifyComponent>(start, out var manacostModifyComp))
-            return;
-
-        foreach (var (magicType, modifier) in Modifiers)
-        {
-            if (manacostModifyComp.Modifiers.ContainsKey(magicType))
-            {
-                if (modifier >= 1f)
-                    manacostModifyComp.Modifiers[magicType] += modifier - 1f;
-                else
-                    manacostModifyComp.Modifiers[magicType] -= 1f - modifier;
-            }
-            else
-            {
-                manacostModifyComp.Modifiers[magicType] = modifier;
-            }
-        }
-    }
-}

Content.Shared/CCVar/CCVars.Misc.cs

@@ -12,7 +12,7 @@ public sealed partial class CCVars
     ///     Should we pre-load all of the procgen atlasses.
     /// </summary>
     public static readonly CVarDef<bool> ProcgenPreload =
-        CVarDef.Create("procgen.preload", true, CVar.SERVERONLY);
+        CVarDef.Create("procgen.preload", false, CVar.SERVERONLY); //CP14 false by default
 
     /// <summary>
     ///     Enabled: Cloning has 70% cost and reclaimer will refuse to reclaim corpses with souls. (For LRP).
@@ -84,7 +84,7 @@ public sealed partial class CCVars
         CVarDef.Create("entgc.maximum_time_ms", 5, CVar.SERVERONLY);
 
     public static readonly CVarDef<bool> GatewayGeneratorEnabled =
-        CVarDef.Create("gateway.generator_enabled", true);
+        CVarDef.Create("gateway.generator_enabled", false); //CP14 false by default
 
     public static readonly CVarDef<string> TippyEntity =
         CVarDef.Create("tippy.entity", "Tippy", CVar.SERVER | CVar.REPLICATED);

Content.Shared/Maps/ContentTileDefinition.cs

@@ -130,12 +130,6 @@ namespace Content.Shared.Maps
         [DataField]
         public ProtoId<ContentTileDefinition>? BurnedTile { get; private set; } = null;
 
-        /// <summary>
-        /// CP14 - color for footprints
-        /// </summary>
-        [DataField]
-        public Color? Color;
-
         /// <summary>
         /// CP14 - auto removing spilled reagents from tile
         /// </summary>

Content.Shared/_CP14/LockKey/SharedCP14LockKeySystem.cs

@@ -85,9 +85,6 @@ public sealed class SharedCP14LockKeySystem : EntitySystem
         if (!args.CanReach || args.Target is not { Valid: true })
             return;
 
-        if (_doorQuery.TryComp(args.Target, out var doorComponent) && doorComponent.State == DoorState.Open)
-            return;
-
         if (!_lockQuery.TryComp(args.Target, out _))
             return;
 
@@ -231,6 +228,9 @@ public sealed class SharedCP14LockKeySystem : EntitySystem
         if (!TryComp<LockComponent>(target, out var lockComp))
             return;
 
+        if (_doorQuery.TryComp(target, out var doorComponent) && doorComponent.State == DoorState.Open)
+            return;
+
         var keyShape = key.Comp.LockShape;
         var lockShape = target.Comp.LockShape;
 

Content.Shared/_CP14/MagicManacostModify/CP14MagicManacostModifyComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Shared._CP14.MagicManacostModify;
 /// <summary>
 /// Changes the manacost of spells for the bearer
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, Access(typeof(CP14MagicManacostModifySystem))]
 public sealed partial class CP14MagicManacostModifyComponent : Component
 {
     [DataField]

Content.Shared/_CP14/MagicSpellStorage/CP14SpellStorageSystem.cs

@@ -3,7 +3,6 @@ using Content.Shared._CP14.MagicSpell.Components;
 using Content.Shared._CP14.MagicSpell.Events;
 using Content.Shared.Actions;
 using Content.Shared.Clothing;
-using Robust.Shared.Prototypes;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Damage;
 using Content.Shared.Hands;
@@ -58,7 +57,14 @@ public sealed partial class CP14SpellStorageSystem : EntitySystem
 
         foreach (var spell in mStorage.Comp.Spells)
         {
-            TryAddSpellToStorage(mStorage, spell);
+            var spellEnt = _actionContainer.AddAction(mStorage, spell);
+            if (spellEnt is null)
+                continue;
+
+            var provided = EntityManager.EnsureComponent<CP14MagicEffectComponent>(spellEnt.Value);
+            provided.SpellStorage = mStorage;
+
+            mStorage.Comp.SpellEntities.Add(spellEnt.Value);
         }
     }
 
@@ -143,21 +149,6 @@ public sealed partial class CP14SpellStorageSystem : EntitySystem
         return true;
     }
 
-    public bool TryAddSpellToStorage(Entity<CP14SpellStorageComponent> mStorage, EntProtoId spell)
-    {
-        if (_net.IsClient)
-            return false;
-
-        var spellEnt = _actionContainer.AddAction(mStorage, spell);
-        if (spellEnt is null)
-            return false;
-
-        var provided = EntityManager.EnsureComponent<CP14MagicEffectComponent>(spellEnt.Value);
-        provided.SpellStorage = mStorage;
-
-        mStorage.Comp.SpellEntities.Add(spellEnt.Value);
-        return true;
-    }
     private void OnRemovedAttune(Entity<CP14SpellStorageRequireAttuneComponent> ent, ref RemovedAttuneFromMindEvent args)
     {
         if (args.User is null)

Resources/Audio/_CP14/Items/attributions.yml

@@ -53,11 +53,6 @@
   copyright: 'by deleted_user_7146007 of Freesound.org. Cropped and mixed from stereo to mono.'
   source: "https://freesound.org/people/deleted_user_7146007/sounds/383725/"
 
-- files: ["broom1.ogg", "broom2.ogg", "broom3.ogg"]
-  license: "CC-BY-4.0"
-  copyright: 'by F.M.Audio of Freesound.org. Cropped by TheShuEd.'
-  source: "https://freesound.org/people/F.M.Audio/sounds/552056/"
-
 - files: ["book1.ogg"]
   license: "CC-BY-4.0"
   copyright: 'by flag2 of Freesound.org. edit to Mono by TheShuEd.'

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

@@ -3,6 +3,3 @@ cp14-material-dirt-block = dirt
 cp14-material-stone-block = stone
 cp14-material-cloth = cloth
 cp14-material-flora = flora material
-cp14-material-glowing-iron = glowing iron
-cp14-material-glowing-wooden-planks = glowing wooden planks
-

Resources/Locale/en-US/_CP14/modularCraft/slots.ftl

@@ -1,5 +1,2 @@
 cp14-modular-slot-blade = blade
-cp14-modular-slot-garde = garde
-cp14-modular-slot-magic-crystal = magic crystal
-cp14-modular-slot-magic-crystal-holder = magic crystal holder
-cp14-modular-slot-magic-artifact = magic artefact
+cp14-modular-slot-garde = garde

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

@@ -8,7 +8,6 @@ cp14-stack-flora = tufts of grass
 cp14-stack-copper-bars = copper bars
 cp14-stack-iron-bars = iron bars
 cp14-stack-gold-bars = gold bars
-cp14-stack-glowing-iron-bars = bars of glowing iron
 
 cp14-stack-wallpaper = rolls of wallpaper
 

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

@@ -7,6 +7,9 @@ cp14-tiles-grass-light = light grass
 cp14-tiles-grass-tall = tall grass
 cp14-tiles-dirt = soil
 cp14-tiles-sand = sand
+cp14-tiles-snow = snow
+cp14-tiles-snow-deep = deep snow
+cp14-tiles-snow-deep-deep = deep deep snow
 
 # Produced
 cp14-tiles-foundation = foundation

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

@@ -1,4 +1,4 @@
-tiles-space = space
+tiles-space = ocean
 tiles-plating = plating
 tiles-lattice = lattice
 tiles-lattice-train = train lattice

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

@@ -3,5 +3,3 @@ cp14-material-dirt-block = земля
 cp14-material-stone-block = камень
 cp14-material-cloth = ткань
 cp14-material-flora = растительный материал
-cp14-material-glowing-iron = сверкающее железо
-cp14-material-glowing-wooden-planks = сверкающие деревянные доски

Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl

@@ -1,6 +1,2 @@
 cp14-modular-slot-blade = лезвие
-cp14-modular-slot-jewerly1 = украшение (1)
-cp14-modular-slot-magic-crystal = магический кристалл
-cp14-modular-slot-magic-crystal-holder = держатель магических кристаллов
-cp14-modular-slot-garde = гарда
-cp14-modular-slot-magic-artifact = магический артефакт
+cp14-modular-slot-garde = гарда

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

@@ -8,8 +8,7 @@ cp14-stack-flora = пучки травы
 cp14-stack-copper-bars = медные слитки
 cp14-stack-iron-bars = железные слитки
 cp14-stack-gold-bars = золотые слитки
-cp14-stack-glowing-iron-bars = слитки сверкающего железа
 
 cp14-stack-wallpaper = рулон обоев
 
-cp14-stack-glass-sheet = стекло
+cp14-stack-glass-sheet = стекло

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

@@ -7,6 +7,9 @@ cp14-tiles-grass-light = светлая трава
 cp14-tiles-grass-tall = высокая трава
 cp14-tiles-dirt = почва
 cp14-tiles-sand = песок
+cp14-tiles-snow = снег
+cp14-tiles-snow-deep = глубокий снег
+cp14-tiles-snow-deep-deep = очень глубокий снег
 
 # Produced
 cp14-tiles-foundation = фундамент

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

@@ -1,4 +1,4 @@
-tiles-space = космос
+tiles-space = океан
 tiles-plating = покрытие
 tiles-lattice = решётка
 tiles-lattice-train = решётка поезда

Resources/Prototypes/_CP14/Catalog/Fills/crates.yml

@@ -54,7 +54,6 @@
       - id: CP14ManaOperationGlove
       - id: CP14ModularIronShovel
       - id: CP14BaseMop
-      - id: CP14BaseBroom
       - id: CP14ModularIronPickaxe
       - id: CP14ModularIronSickle
       - !type:GroupSelector

Resources/Prototypes/_CP14/Decal/footprints.yml

@@ -1,13 +0,0 @@
-- type: decal
-  id: CP14Footprints
-  showMenu: true
-  sprite:
-    sprite: _CP14/Decals/footprints.rsi
-    state: footprint
-
-- type: decal
-  id: CP14FootprintsBoots
-  showMenu: true
-  sprite:
-    sprite: _CP14/Decals/footprints.rsi
-    state: boots

Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml

@@ -13,7 +13,6 @@
     state: icon
   - type: Item
     size: Normal
-  - type: CP14FootprintHolder
     
 - type: entity
   parent: CP14ClothingShoesBase

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

@@ -71,4 +71,16 @@
       - state: forest
       - state: frame
   - type: CP14BiomeSpawner
-    biome: CP14GrasslandHills
+    biome: CP14GrasslandHills
+
+- type: entity
+  id: CP14BiomeSpawnerSnowland
+  parent: CP14BaseBiomeSpawner
+  suffix: Snowland
+  components:
+  - type: Sprite
+    layers:
+      - state: snow
+      - state: frame
+  - type: CP14BiomeSpawner
+    biome: CP14Snowland

Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml

@@ -221,9 +221,6 @@
   - type: CP14MagicUnsafeSleep
   - type: CP14MagicAttuningMind
     autoCopyToMind: true
-  - type: CP14FootprintHolder
-    decalProto: CP14Footprints
-  - type: CP14FootprintTrailer
   - type: CP14DemiplaneStabilizer
     requireAlive: true
   - type: CanEnterCryostorage
@@ -232,9 +229,9 @@
   - type: CanMoveInAir # read: CanSwimInOcean lol
   - type: MovementAlwaysTouching
   - type: MovementSpeedModifier
-    weightlessAcceleration: 0.7 # Slow swimming
-    weightlessFriction: 3
-    weightlessModifier: 0.5
+    weightlessAcceleration: 0.8 # Slow swimming
+    weightlessFriction: 2
+    weightlessModifier: 0.6
   - type: CP14DamageableByMap
 
 

Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml

@@ -1,6 +1,6 @@
 - type: entity
   parent: 
-  - BaseMobSpecies
+  - CP14BaseMobSpecies
   - MobFlammable
   id: CP14BaseMobSkeleton
   name: Mr. Skeleton

Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml

@@ -221,7 +221,7 @@
   parent: CP14WildProduceBase
   name: blue Amanita
   description: A sky blue flower known for its medicinal and magical properties.
-  components:
+  components: 
   - type: Sprite
     sprite: _CP14/Objects/Flora/Wild/blue_amanita.rsi
     layers:
@@ -244,7 +244,7 @@
         reagents:
         - ReagentId: CP14BlueAmanita
           Quantity: 5
-
+  
 - type: entity
   id: CP14Dayflin
   parent: CP14WildProduceBase
@@ -272,43 +272,4 @@
         maxVol: 5
         reagents:
         - ReagentId: CP14YellowDayflinPulp
-          Quantity: 4
-
-- type: entity
-  id: CP14FoodGlowingFruit
-  parent: FoodInjectableBase
-  categories: [ ForkFiltered ]
-  name: glowing fruit
-  description: Glowing Fruit. Exudes mana.
-  components:
-  - type: Tag
-    tags:
-    - CP14FitInMortar
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Item
-    size: Tiny
-  - type: FlavorProfile
-    flavors:
-      - CP14Magic
-  - type: Sprite
-    sprite: _CP14/Objects/Flora/Farm/glowing_fruit.rsi
-    layers:
-      - state: base1
-        map: [ "random" ]
-  - type: RandomSprite
-    available:
-      - random:
-          base1: ""
-          base2: ""
-          base3: ""
-          base4: ""
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: CP14BlueAmanita
-          Quantity: 4
+          Quantity: 4

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

@@ -167,49 +167,4 @@
   suffix: 10
   components:
   - type: Stack
-    count: 10
-
-- type: entity
-  id: CP14GlowingIronBar1
-  parent: BaseItem
-  name: glowing iron bar
-  suffix: 1
-  description: A heavy piece of refined glowing iron
-  categories: [ ForkFiltered ]
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-  - type: Item
-    size: Normal
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/glowingiron_bar.rsi
-    layers:
-      - state: bar
-        map: ["base"]
-  - type: Appearance
-  - type: Stack
-    stackType: CP14GlowingIronBar
-    count: 1
-    baseLayer: base
-    layerStates:
-    - bar
-    - bar_2
-    - bar_3
-  - type: Material
-
-- type: entity
-  id: CP14GlowingIronBar5
-  parent: CP14GlowingIronBar1
-  suffix: 5
-  components:
-  - type: Stack
-    count: 5
-
-- type: entity
-  id: CP14GlowingIronBar10
-  parent: CP14GlowingIronBar1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
+    count: 10

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

@@ -142,57 +142,6 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
-- type: entity
-  id: CP14GlowingWoodLog
-  parent: BaseItem
-  name: glowing wooden log
-  description: A piece of unprocessed wood. Good material for building, or starting a fire.
-  categories: [ ForkFiltered ]
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Item
-    size: Normal
-    shape:
-    - 0,0,1,0
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/wood.rsi
-    layers:
-      - state: log
-  - type: Tag
-    tags:
-    - CP14FireplaceFuel
-    - Wooden
-  - type: Flammable
-    fireSpread: false
-    canResistFire: false
-    alwaysCombustible: true
-    canExtinguish: true
-    cP14FireplaceFuel: 30
-    damage:
-      types:
-        Heat: 1
-  - type: Log
-    spawnedPrototype: CP14GlowingWoodenPlanks1
-    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
@@ -265,78 +214,6 @@
   - type: Stack
     count: 10
 
-- type: entity
-  id: CP14GlowingWoodenPlanks1
-  parent: BaseItem
-  name: glowing 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: FloorTile
-    placeTileSound:
-      path: /Audio/Effects/woodenclosetclose.ogg
-      params:
-        variation: 0.03
-        volume: 2
-    outputs:
-      - CP14FloorOakWoodPlanks # TODO
-  - type: Stack
-    stackType: CP14GlowingWoodenPlanks
-    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: CP14GlowingWoodenPlanks10
-  parent: CP14GlowingWoodenPlanks1
-  suffix: 10
-  components:
-  - type: Stack
-    count: 10
-
 - type: entity
   id: CP14Nail1
   parent: BaseItem

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal.yml

@@ -1,371 +0,0 @@
-# Base
-- type: entity
-  id: CP14MagicCrystalBase
-  parent: BaseItem
-  abstract: true
-  name: magic crystal
-  description: Mana-conducting crystal, contains a spell.
-  categories: [ ForkFiltered ]
-  components:
-  - type: CP14SpellStorageAccessHolding
-  - type: Item
-    size: Tiny
-  - type: Sprite
-    sprite: _CP14/Objects/Magic/magic_crystal.rsi
-    state: crystal_grey
-  - type: PointLight
-    radius: 1.2
-    energy: 2
-    color: "#808080"
-
-# SpellSphereOfLight
-- type: entity
-  id: CP14MagicCrystalSpellSphereOfLight
-  parent: CP14MagicCrystalBase
-  suffix: SphereOfLight
-  components:
-  - type: Sprite
-    color: "#FFFFE0"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellSphereOfLight
-  - type: PointLight
-    color: "#FFFFE0"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellSphereOfLight
-    - HolderMagicCrystal1_SpellSphereOfLight
-    - HolderMagicCrystal2_SpellSphereOfLight
-    - HolderMagicCrystal3_SpellSphereOfLight
-    - HolderMagicCrystal4_SpellSphereOfLight
-    - StaffHolderMagicCrystal1_SpellSphereOfLight
-
-# SpellFlashLight
-- type: entity
-  id: CP14MagicCrystalSpellFlashLight
-  parent: CP14MagicCrystalBase
-  suffix: SpellFlashLight
-  components:
-  - type: Sprite
-    color: "#FFFFE0"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellFlashLight
-  - type: PointLight
-    color: "#FFFFE0"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellFlashLight
-    - HolderMagicCrystal1_SpellFlashLight
-    - HolderMagicCrystal2_SpellFlashLight
-    - HolderMagicCrystal3_SpellFlashLight
-    - HolderMagicCrystal4_SpellFlashLight
-    - StaffHolderMagicCrystal1_SpellFlashLight
-
-# SpellEarthWall
-- type: entity
-  id: CP14MagicCrystalSpellEarthWall
-  parent: CP14MagicCrystalBase
-  suffix: SpellEarthWall
-  components:
-  - type: Sprite
-    color: "#8B4513"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellEarthWall
-  - type: PointLight
-    color: "#8B4513"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellEarthWall
-    - HolderMagicCrystal1_SpellEarthWall
-    - HolderMagicCrystal2_SpellEarthWall
-    - HolderMagicCrystal3_SpellEarthWall
-    - HolderMagicCrystal4_SpellEarthWall
-    - StaffHolderMagicCrystal1_SpellEarthWall
-
-# SpellFlameCreation
-- type: entity
-  id: CP14MagicCrystalSpellFlameCreation
-  parent: CP14MagicCrystalBase
-  suffix: SpellFlameCreation
-  components:
-  - type: Sprite
-    color: "#FF4500"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellFlameCreation
-  - type: PointLight
-    color: "#FF4500"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellFlameCreation
-    - HolderMagicCrystal1_SpellFlameCreation
-    - HolderMagicCrystal2_SpellFlameCreation
-    - HolderMagicCrystal3_SpellFlameCreation
-    - HolderMagicCrystal4_SpellFlameCreation
-    - StaffHolderMagicCrystal1_SpellFlameCreation
-
-# SpellFireball
-- type: entity
-  id: CP14MagicCrystalSpellFireball
-  parent: CP14MagicCrystalBase
-  suffix: SpellFireball
-  components:
-  - type: Sprite
-    color: "#FF4500"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellFireball
-  - type: PointLight
-    color: "#FF4500"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellFireball
-    - HolderMagicCrystal1_SpellFireball
-    - HolderMagicCrystal2_SpellFireball
-    - HolderMagicCrystal3_SpellFireball
-    - HolderMagicCrystal4_SpellFireball
-    - StaffHolderMagicCrystal1_SpellFireball
-
-# SpellShadowStep
-- type: entity
-  id: CP14MagicCrystalSpellShadowStep
-  parent: CP14MagicCrystalBase
-  suffix: SpellShadowStep
-  components:
-  - type: Sprite
-    color: "#483D8B"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellShadowStep
-  - type: PointLight
-    color: "#483D8B"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellShadowStep
-    - HolderMagicCrystal1_SpellShadowStep
-    - HolderMagicCrystal2_SpellShadowStep
-    - HolderMagicCrystal3_SpellShadowStep
-    - HolderMagicCrystal4_SpellShadowStep
-    - StaffHolderMagicCrystal1_SpellShadowStep
-
-# SpellCureBurn
-- type: entity
-  id: CP14MagicCrystalSpellCureBurn
-  parent: CP14MagicCrystalBase
-  suffix: SpellCureBurn
-  components:
-  - type: Sprite
-    color: "#7CFC00"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellCureBurn
-  - type: PointLight
-    color: "#7CFC00"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellCureBurn
-    - HolderMagicCrystal1_SpellCureBurn
-    - HolderMagicCrystal2_SpellCureBurn
-    - HolderMagicCrystal3_SpellCureBurn
-    - HolderMagicCrystal4_SpellCureBurn
-    - StaffHolderMagicCrystal1_SpellCureBurn
-
-# SpellBloodPurification
-- type: entity
-  id: CP14MagicCrystalSpellBloodPurification
-  parent: CP14MagicCrystalBase
-  suffix: SpellBloodPurification
-  components:
-  - type: Sprite
-    color: "#7CFC00"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellBloodPurification
-  - type: PointLight
-    color: "#7CFC00"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellBloodPurification
-    - HolderMagicCrystal1_SpellBloodPurification
-    - HolderMagicCrystal2_SpellBloodPurification
-    - HolderMagicCrystal3_SpellBloodPurification
-    - HolderMagicCrystal4_SpellBloodPurification
-    - StaffHolderMagicCrystal1_SpellBloodPurification
-
-# SpellCureWounds
-- type: entity
-  id: CP14MagicCrystalSpellCureWounds
-  parent: CP14MagicCrystalBase
-  suffix: SpellCureWounds
-  components:
-  - type: Sprite
-    color: "#7CFC00"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellCureWounds
-  - type: PointLight
-    color: "#7CFC00"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellCureWounds
-    - HolderMagicCrystal1_SpellCureWounds
-    - HolderMagicCrystal2_SpellCureWounds
-    - HolderMagicCrystal3_SpellCureWounds
-    - HolderMagicCrystal4_SpellCureWounds
-    - StaffHolderMagicCrystal1_SpellCureWounds
-
-# SpellManaConsume
-- type: entity
-  id: CP14MagicCrystalSpellManaConsume
-  parent: CP14MagicCrystalBase
-  suffix: SpellManaConsume
-  components:
-  - type: Sprite
-    color: "#66CDAA"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellManaConsume
-  - type: PointLight
-    color: "#66CDAA"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellManaConsume
-    - HolderMagicCrystal1_SpellManaConsume
-    - HolderMagicCrystal2_SpellManaConsume
-    - HolderMagicCrystal3_SpellManaConsume
-    - HolderMagicCrystal4_SpellManaConsume
-    - StaffHolderMagicCrystal1_SpellManaConsume
-
-# SpellManaGift
-- type: entity
-  id: CP14MagicCrystalSpellManaGift
-  parent: CP14MagicCrystalBase
-  suffix: SpellManaGift
-  components:
-  - type: Sprite
-    color: "#66CDAA"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellManaGift
-  - type: PointLight
-    color: "#66CDAA"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellManaGift
-    - HolderMagicCrystal1_SpellManaGift
-    - HolderMagicCrystal2_SpellManaGift
-    - HolderMagicCrystal3_SpellManaGift
-    - HolderMagicCrystal4_SpellManaGift
-    - StaffHolderMagicCrystal1_SpellManaGift
-
-# SpellShadowGrab
-- type: entity
-  id: CP14MagicCrystalSpellShadowGrab
-  parent: CP14MagicCrystalBase
-  suffix: SpellShadowGrab
-  components:
-  - type: Sprite
-    color: "#483D8B"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellShadowGrab
-  - type: PointLight
-    color: "#483D8B"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellShadowGrab
-    - HolderMagicCrystal1_SpellShadowGrab
-    - HolderMagicCrystal2_SpellShadowGrab
-    - HolderMagicCrystal3_SpellShadowGrab
-    - HolderMagicCrystal4_SpellShadowGrab
-    - StaffHolderMagicCrystal1_SpellShadowGrab
-
-# SpellResurrection
-- type: entity
-  id: CP14MagicCrystalSpellResurrection
-  parent: CP14MagicCrystalBase
-  suffix: SpellResurrection
-  components:
-  - type: Sprite
-    color: "#2E8B57"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellResurrection
-  - type: PointLight
-    color: "#2E8B57"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellResurrection
-    - HolderMagicCrystal1_SpellResurrection
-    - HolderMagicCrystal2_SpellResurrection
-    - HolderMagicCrystal3_SpellResurrection
-    - HolderMagicCrystal4_SpellResurrection
-    - StaffHolderMagicCrystal1_SpellResurrection
-
-# SpellWaterCreation
-- type: entity
-  id: CP14MagicCrystalSpellWaterCreation
-  parent: CP14MagicCrystalBase
-  suffix: SpellWaterCreation
-  components:
-  - type: Sprite
-    color: "#5eabeb"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellWaterCreation
-  - type: PointLight
-    color: "#5eabeb"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellWaterCreation
-    - HolderMagicCrystal1_SpellWaterCreation
-    - HolderMagicCrystal2_SpellWaterCreation
-    - HolderMagicCrystal3_SpellWaterCreation
-    - HolderMagicCrystal4_SpellWaterCreation
-    - StaffHolderMagicCrystal1_SpellWaterCreation
-
-# SpellBeerCreation
-- type: entity
-  id: CP14MagicCrystalSpellBeerCreation
-  parent: CP14MagicCrystalBase
-  suffix: SpellBeerCreation
-  components:
-  - type: Sprite
-    color: "#5eabeb"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellBeerCreation
-  - type: PointLight
-    color: "#5eabeb"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellBeerCreation
-    - HolderMagicCrystal1_SpellBeerCreation
-    - HolderMagicCrystal2_SpellBeerCreation
-    - HolderMagicCrystal3_SpellBeerCreation
-    - HolderMagicCrystal4_SpellBeerCreation
-    - StaffHolderMagicCrystal1_SpellBeerCreation
-
-# SpellIceShards
-- type: entity
-  id: CP14MagicCrystalSpellIceShards
-  parent: CP14MagicCrystalBase
-  suffix: SpellIceShards
-  components:
-  - type: Sprite
-    color: "#5eabeb"
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellIceShards
-  - type: PointLight
-    color: "#5eabeb"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - RingMagicCrystal1_SpellIceShards
-    - HolderMagicCrystal1_SpellIceShards
-    - HolderMagicCrystal2_SpellIceShards
-    - HolderMagicCrystal3_SpellIceShards
-    - HolderMagicCrystal4_SpellIceShards
-    - StaffHolderMagicCrystal1_SpellIceShards

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/magic_crystal_holder.yml

@@ -1,259 +0,0 @@
-# Base holder
-- type: entity
-  id: CP14MagicCrystalHolderBase
-  parent: BaseItem
-  abstract: true
-  name: magic crystals holder
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Tiny
-
-# Blue holder
-- type: entity
-  id: CP14MagicCrystalHolder_BaseBlue
-  parent: CP14MagicCrystalHolderBase
-  name: magic crystals holder
-  abstract: true
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Sprite
-    sprite: _CP14/Objects/Magic/Holders/magic_crystal_holder_blue.rsi
-
-- type: entity
-  id: CP14MagicCrystalHolder_Blue1
-  parent: CP14MagicCrystalHolder_BaseBlue
-  name: magic crystals holder
-  description:  Holder for magic crystals, has one slot.
-  suffix: 1 slot
-  components:
-  - type: Sprite
-    state: icon1
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Blue1
-
-- type: entity
-  id: CP14MagicCrystalHolder_Blue2
-  parent: CP14MagicCrystalHolder_BaseBlue
-  name: magic crystals holder
-  description:  Holder for magic crystals, has two slots.
-  suffix: 2 slots
-  components:
-  - type: Sprite
-    state: icon2
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Blue2
-
-- type: entity
-  id: CP14MagicCrystalHolder_Blue3
-  parent: CP14MagicCrystalHolder_BaseBlue
-  name: magic crystals holder
-  description:  Holder for magic crystals, has three slots.
-  suffix: 3 slots
-  components:
-  - type: Sprite
-    state: icon3
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Blue3
-
-- type: entity
-  id: CP14MagicCrystalHolder_Blue4
-  parent: CP14MagicCrystalHolder_BaseBlue
-  name: magic crystals holder
-  description:  Holder for magic crystals, has four slots.
-  suffix: 4 slots
-  components:
-  - type: Sprite
-    state: icon4
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Blue4
-
-# cooper holder
-- type: entity
-  id: CP14MagicCrystalHolder_BaseCooper
-  parent: CP14MagicCrystalHolderBase
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Magic/Holders/magic_crystal_holder_cooper.rsi
-
-- type: entity
-  id: CP14MagicCrystalHolder_Cooper1
-  parent: CP14MagicCrystalHolder_BaseCooper
-  name: magic crystals holder
-  description:  Holder for magic crystals, has one slot.
-  suffix: 1 slot
-  components:
-  - type: Sprite
-    state: icon1
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Cooper1
-
-- type: entity
-  id: CP14MagicCrystalHolder_Cooper2
-  parent: CP14MagicCrystalHolder_BaseCooper
-  name: magic crystals holder
-  description:  Holder for magic crystals, has two slots.
-  suffix: 2 slots
-  components:
-  - type: Sprite
-    state: icon2
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Cooper2
-
-- type: entity
-  id: CP14MagicCrystalHolder_Cooper3
-  parent: CP14MagicCrystalHolder_BaseCooper
-  name: magic crystals holder
-  description:  Holder for magic crystals, has three slots.
-  suffix: 3 slots
-  components:
-  - type: Sprite
-    state: icon3
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Cooper3
-
-- type: entity
-  id: CP14MagicCrystalHolder_Cooper4
-  parent: CP14MagicCrystalHolder_BaseCooper
-  name: magic crystals holder
-  description:  Holder for magic crystals, has four slots.
-  suffix: 4 slots
-  components:
-  - type: Sprite
-    state: icon4
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Cooper4
-
-# iron holder
-- type: entity
-  id: CP14MagicCrystalHolder_BaseIron
-  parent: CP14MagicCrystalHolderBase
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Magic/Holders/magic_crystal_holder_iron.rsi
-
-- type: entity
-  id: CP14MagicCrystalHolder_Iron1
-  parent: CP14MagicCrystalHolder_BaseIron
-  name: magic crystals holder
-  description:  Holder for magic crystals, has one slot.
-  suffix: 1 slot
-  components:
-  - type: Sprite
-    state: icon1
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Iron1
-
-- type: entity
-  id: CP14MagicCrystalHolder_Iron2
-  parent: CP14MagicCrystalHolder_BaseIron
-  name: magic crystals holder
-  description:  Holder for magic crystals, has two slots.
-  suffix: 2 slots
-  components:
-  - type: Sprite
-    state: icon2
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Iron2
-
-- type: entity
-  id: CP14MagicCrystalHolder_Iron3
-  parent: CP14MagicCrystalHolder_BaseIron
-  name: magic crystals holder
-  description:  Holder for magic crystals, has three slots.
-  suffix: 3 slots
-  components:
-  - type: Sprite
-    state: icon3
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Iron3
-
-- type: entity
-  id: CP14MagicCrystalHolder_Iron4
-  parent: CP14MagicCrystalHolder_BaseIron
-  name: magic crystals holder
-  description:  Holder for magic crystals, has four slots.
-  suffix: 4 slots
-  components:
-  - type: Sprite
-    state: icon4
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Iron4
-
-# gold holder
-- type: entity
-  id: CP14MagicCrystalHolder_BaseGold
-  parent: CP14MagicCrystalHolderBase
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Magic/Holders/magic_crystal_holder_gold.rsi
-
-- type: entity
-  id: CP14MagicCrystalHolder_Gold1
-  parent: CP14MagicCrystalHolder_BaseGold
-  name: magic crystals holder
-  description:  Holder for magic crystals, has one slot.
-  suffix: 1 slot
-  components:
-  - type: Sprite
-    state: icon1
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Gold1
-
-- type: entity
-  id: CP14MagicCrystalHolder_Gold2
-  parent: CP14MagicCrystalHolder_BaseGold
-  name: magic crystals holder
-  description:  Holder for magic crystals, has two slots.
-  suffix: 2 slots
-  components:
-  - type: Sprite
-    state: icon2
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Gold2
-
-- type: entity
-  id: CP14MagicCrystalHolder_Gold3
-  parent: CP14MagicCrystalHolder_BaseGold
-  name: magic crystals holder
-  description:  Holder for magic crystals, has three slots.
-  suffix: 3 slots
-  components:
-  - type: Sprite
-    state: icon3
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Gold3
-
-- type: entity
-  id: CP14MagicCrystalHolder_Gold4
-  parent: CP14MagicCrystalHolder_BaseGold
-  name: magic crystals holder
-  description:  Holder for magic crystals, has four slots.
-  suffix: 4 slots
-  components:
-  - type: Sprite
-    state: icon4
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - StaffMagicCrystalHolder_Gold4

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/ring.yml

@@ -1,104 +0,0 @@
-# Base ring
-- type: entity
-  parent: Clothing
-  id: CP14ClothingMagicRingBase
-  categories: [ ForkFiltered ]
-  abstract: true
-  name: ring
-  description: Magic Ring. Has space for a magic crystal.
-  components:
-  - type: Item
-    size: Tiny
-  - type: Clothing
-    slots:
-    - ring
-  - type: Sprite
-    sprite: _CP14/Clothing/Rings/rings.rsi
-  - type: CP14SpellStorageAccessWearing
-  - type: CP14SpellStorage
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ClothingMagicRingBase
-    startSlots:
-    - RingMagicCrystal1
-    - MagicArtifact1
-  - type: CP14MagicManacostModify
-
-# Blue ring
-- type: entity
-  parent: CP14ClothingMagicRingBase
-  id: CP14ClothingMagicRingBlue
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Sprite
-    state: blue_ring
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 0.9
-     Fire: 0.9
-     Gate: 0.9
-     Healing: 0.9
-     LightDarkness: 0.9
-     Meta: 0.9
-     Movement: 0.9
-     Water: 0.9
-     Necromancy: 0.9
-
-# cooper ring
-- type: entity
-  parent: CP14ClothingMagicRingBase
-  id: CP14ClothingMagicRingCooper
-  components:
-  - type: Sprite
-    state: cooper_ring
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 1.05
-     Fire: 1.05
-     Gate: 1.05
-     Healing: 1.05
-     LightDarkness: 1.05
-     Meta: 1.05
-     Movement: 1.05
-     Water: 1.05
-     Necromancy: 1.05
-
-# iron ring
-- type: entity
-  parent: CP14ClothingMagicRingBase
-  id: CP14ClothingMagicRingIron
-  components:
-  - type: Sprite
-    state: iron_ring
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 1.05
-     Fire: 1.05
-     Gate: 1.05
-     Healing: 1.05
-     LightDarkness: 1.05
-     Meta: 1.05
-     Movement: 1.05
-     Water: 1.05
-     Necromancy: 1.05
-
-# gold ring
-- type: entity
-  parent: CP14ClothingMagicRingBase
-  id: CP14ClothingMagicRingGold
-  components:
-  - type: Sprite
-    state: gold_ring
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 1.05
-     Fire: 1.05
-     Gate: 1.05
-     Healing: 1.05
-     LightDarkness: 1.05
-     Meta: 1.05
-     Movement: 1.05
-     Water: 1.05
-     Necromancy: 1.05

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/scrolls.yml

@@ -1,394 +0,0 @@
-# Base
-- type: entity
-  parent: BaseItem
-  id: CP14BaseOldMagicScroll
-  categories: [ ForkFiltered ]
-  name: old magic scroll
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells.
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Bureaucracy/paper.rsi
-  - type: Item
-    size: Tiny
-  - type: Flammable
-    fireSpread: true
-    alwaysCombustible: true
-    damage:
-      types:
-        Heat: 1
-  - type: FireVisuals
-    sprite: Effects/fire.rsi
-    normalState: fire
-  - type: Damageable
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 15
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawn:
-            Ash:
-              min: 1
-              max: 1
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Food
-    solution: food
-    delay: 7
-    forceFeedDelay: 7
-  - type: FlavorProfile
-    flavors:
-    - paper
-    - CP14Magic
-  - type: BadFood
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 1
-        reagents:
-        - ReagentId: Fiber
-          Quantity: 1
-
-# Earth
-- type: entity
-  id: CP14OldMagicScroll_Earth5
-  parent: CP14BaseOldMagicScroll
-  suffix: Earth, 5
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Earth" type by 5%
-  components:
-  - type: Sprite
-    layers:
-    - state: paper_filled
-      color: "#000000"
-    - state: magic
-      shader: unshaded
-      color: "#70533f"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Earth5
-
-- type: entity
-  id: CP14OldMagicScroll_Earth10
-  parent: CP14OldMagicScroll_Earth5
-  suffix: Earth, 10
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Earth" type by 10%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Earth10
-
-- type: entity
-  id: CP14OldMagicScroll_Earth15
-  parent: CP14OldMagicScroll_Earth5
-  suffix: Earth, 15
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Earth" type by 15%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Earth15
-
-# Fire
-- type: entity
-  id: CP14OldMagicScroll_Fire5
-  parent: CP14BaseOldMagicScroll
-  suffix: Fire, 5
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Fire" type by 5%
-  components:
-  - type: Sprite
-    layers:
-    - state: paper_filled
-      color: "#000000"
-    - state: magic
-      shader: unshaded
-      color: "#d9741c"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Fire5
-
-- type: entity
-  id: CP14OldMagicScroll_Fire10
-  parent: CP14OldMagicScroll_Fire5
-  suffix: Fire, 10
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Fire" type by 10%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Fire10
-
-- type: entity
-  id: CP14OldMagicScroll_Fire15
-  parent: CP14OldMagicScroll_Fire5
-  suffix: Fire, 15
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Fire" type by 15%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Fire15
-
-# Gate
-- type: entity
-  id: CP14OldMagicScroll_Gate5
-  parent: CP14BaseOldMagicScroll
-  suffix: Gate, 5
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Gate" type by 5%
-  components:
-  - type: Sprite
-    layers:
-    - state: paper_filled
-      color: "#000000"
-    - state: magic
-      shader: unshaded
-      color: "#32597d"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Gate5
-
-- type: entity
-  id: CP14OldMagicScroll_Gate10
-  parent: CP14OldMagicScroll_Gate5
-  suffix: Gate, 10
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Gate" type by 10%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Gate10
-
-- type: entity
-  id: CP14OldMagicScroll_Gate15
-  parent: CP14OldMagicScroll_Gate5
-  suffix: Gate, 15
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Gate" type by 15%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Gate15
-
-# Healing
-- type: entity
-  id: CP14OldMagicScroll_Healing5
-  parent: CP14BaseOldMagicScroll
-  suffix: Healing, 5
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Healing" type by 5%
-  components:
-  - type: Sprite
-    layers:
-    - state: paper_filled
-      color: "#000000"
-    - state: magic
-      shader: unshaded
-      color: "#89e04f"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Healing5
-
-- type: entity
-  id: CP14OldMagicScroll_Healing10
-  parent: CP14OldMagicScroll_Healing5
-  suffix: Healing, 10
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Healing" type by 10%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Healing10
-
-- type: entity
-  id: CP14OldMagicScroll_Healing15
-  parent: CP14OldMagicScroll_Healing5
-  suffix: Healing, 15
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Healing" type by 15%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Healing15
-
-# LightDarkness
-- type: entity
-  id: CP14OldMagicScroll_LightDarkness5
-  parent: CP14BaseOldMagicScroll
-  suffix: LightDarkness, 5
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "LightDarkness" type by 5%
-  components:
-  - type: Sprite
-    layers:
-    - state: paper_filled
-      color: "#000000"
-    - state: magic
-      shader: unshaded
-      color: "#ba97b8"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_LightDarkness5
-
-- type: entity
-  id: CP14OldMagicScroll_LightDarkness10
-  parent: CP14OldMagicScroll_LightDarkness5
-  suffix: LightDarkness, 10
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "LightDarkness" type by 10%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_LightDarkness10
-
-- type: entity
-  id: CP14OldMagicScroll_LightDarkness15
-  parent: CP14OldMagicScroll_LightDarkness5
-  suffix: LightDarkness, 15
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "LightDarkness" type by 15%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_LightDarkness15
-
-# Meta
-- type: entity
-  id: CP14OldMagicScroll_Meta5
-  parent: CP14BaseOldMagicScroll
-  suffix: Meta, 5
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Meta" type by 5%
-  components:
-  - type: Sprite
-    layers:
-    - state: paper_filled
-      color: "#000000"
-    - state: magic
-      shader: unshaded
-      color: "#dcffdb"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Meta5
-
-- type: entity
-  id: CP14OldMagicScroll_Meta10
-  parent: CP14OldMagicScroll_Meta5
-  suffix: Meta, 10
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Meta" type by 10%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Meta10
-
-- type: entity
-  id: CP14OldMagicScroll_Meta15
-  parent: CP14OldMagicScroll_Meta5
-  suffix: Meta, 15
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Meta" type by 15%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Meta15
-
-# Movement
-- type: entity
-  id: CP14OldMagicScroll_Movement5
-  parent: CP14BaseOldMagicScroll
-  suffix: Movement, 5
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Movement" type by 5%
-  components:
-  - type: Sprite
-    layers:
-    - state: paper_filled
-      color: "#000000"
-    - state: magic
-      shader: unshaded
-      color: "#63ceff"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Movement5
-
-- type: entity
-  id: CP14OldMagicScroll_Movement10
-  parent: CP14OldMagicScroll_Movement5
-  suffix: Movement, 10
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Movement" type by 10%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Movement10
-
-- type: entity
-  id: CP14OldMagicScroll_Movement15
-  parent: CP14OldMagicScroll_Movement5
-  suffix: Movement, 15
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Movement" type by 15%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Movement15
-
-# Water
-- type: entity
-  id: CP14OldMagicScroll_Water5
-  parent: CP14BaseOldMagicScroll
-  suffix: Water, 5
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Water" type by 5%
-  components:
-  - type: Sprite
-    layers:
-    - state: paper_filled
-      color: "#000000"
-    - state: magic
-      shader: unshaded
-      color: "#1c94d9"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Water5
-
-- type: entity
-  id: CP14OldMagicScroll_Water10
-  parent: CP14OldMagicScroll_Water5
-  suffix: Water, 10
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Water" type by 10%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Water10
-
-- type: entity
-  id: CP14OldMagicScroll_Water15
-  parent: CP14OldMagicScroll_Water5
-  suffix: Water, 15
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Water" type by 15%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Water15
-
-# Necromancy
-- type: entity
-  id: CP14OldMagicScroll_Necromancy5
-  parent: CP14BaseOldMagicScroll
-  suffix: Necromancy, 5
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Necromancy" type by 5%
-  components:
-  - type: Sprite
-    layers:
-    - state: paper_filled
-      color: "#000000"
-    - state: magic
-      shader: unshaded
-      color: "#1c94d9"
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Necromancy5
-
-- type: entity
-  id: CP14OldMagicScroll_Necromancy10
-  parent: CP14OldMagicScroll_Necromancy5
-  suffix: Necromancy, 10
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Necromancy" type by 10%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Necromancy10
-
-- type: entity
-  id: CP14OldMagicScroll_Necromancy15
-  parent: CP14OldMagicScroll_Necromancy5
-  suffix: Necromancy, 15
-  description: An ancient magical artefact. Can be used on magical items. Reduces mana consumption for spells with the "Necromancy" type by 15%
-  components:
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - MagicArtifact_Necromancy15

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Magic/staff.yml

@@ -1,285 +0,0 @@
-# Base staff
-- type: entity
-  id: CP14MagicStaffBase
-  abstract: true
-  parent:
-  - BaseItem
-  - CP14BaseWeaponDestructible
-  name: magic staff
-  description: A long, magic stick designed to convert magical energy into spells.
-  components:
-  - type: Item
-    size: Ginormous
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Blunt: 6
-  - type: MeleeWeapon
-    angle: 100
-    attackRate: 1.3
-    range: 1.3
-    wideAnimationRotation: 135
-    wideAnimation: CP14WeaponArcSlash
-    damage:
-      types:
-        Blunt: 6
-    soundHit:
-      collection: MetalThud
-    cPAnimationLength: 0.3
-    cPAnimationOffset: -1.3
-  - type: CP14SpellStorageAccessHolding
-  - type: CP14SpellStorage
-  - type: CP14MagicEnergyExaminable
-  - type: CP14MagicEnergyContainer
-  - type: CP14MagicManacostModify
-
-# Glowing wooden Staff
-- type: entity
-  id: CP14MagicStaff_GlowingWooden
-  parent: CP14MagicStaffBase
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi
-    layers:
-    - state: icon
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/glowing_wooden_staff.rsi
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 0.90
-     Fire: 0.90
-     Gate: 0.90
-     Healing: 0.90
-     LightDarkness: 0.90
-     Meta: 0.90
-     Movement: 0.90
-     Water: 0.90
-     Necromancy: 0.90
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14MagicStaff_GlowingWooden
-    startSlots:
-    - MagicCrystalHolder
-    - MagicArtifact1
-
-# Wooden staff
-- type: entity
-  id: CP14MagicStaff_Wooden
-  parent: CP14MagicStaffBase
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi
-    layers:
-    - state: icon
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/wooden_staff.rsi
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 1.15
-     Fire: 1.15
-     Gate: 1.15
-     Healing: 1.15
-     LightDarkness: 1.15
-     Meta: 1.15
-     Movement: 1.15
-     Water: 1.15
-     Necromancy: 1.15
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14MagicStaff_Wooden
-    startSlots:
-    - MagicCrystalHolder
-    - MagicArtifact1
-
-# Glowing Iron Staff
-- type: entity
-  id: CP14MagicStaff_GlowingIron
-  parent: CP14MagicStaffBase
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/blue_staff.rsi
-    layers:
-    - state: icon
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/blue_staff.rsi
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 0.90
-     Fire: 0.90
-     Gate: 0.90
-     Healing: 0.90
-     LightDarkness: 0.90
-     Meta: 0.90
-     Movement: 0.90
-     Water: 0.90
-     Necromancy: 0.90
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14MagicStaff_GlowingWooden
-    startSlots:
-    - MagicCrystalHolder
-    - MagicArtifact1
-
-- type: entity
-  id: CP14MagicStaff_GlowingIronHolder
-  parent: CP14MagicStaffBase
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/blue_staff.rsi
-    layers:
-    - state: icon_holder
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/blue_staff.rsi
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 0.90
-     Fire: 0.90
-     Gate: 0.90
-     Healing: 0.90
-     LightDarkness: 0.90
-     Meta: 0.90
-     Movement: 0.90
-     Water: 0.90
-     Necromancy: 0.90
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14MagicStaff_GlowingWooden
-    startSlots:
-    - MagicCrystalHolder
-    - MagicArtifact1
-    - StaffHolderMagicCrystal1
-
-# Cooper staff
-- type: entity
-  id: CP14MagicStaff_Cooper
-  parent: CP14MagicStaffBase
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/cooper_staff.rsi
-    layers:
-    - state: icon
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/cooper_staff.rsi
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 1.05
-     Fire: 1.05
-     Gate: 1.05
-     Healing: 1.05
-     LightDarkness: 1.05
-     Meta: 1.05
-     Movement: 1.05
-     Water: 1.05
-     Necromancy: 1.05
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14MagicStaff_Cooper
-    startSlots:
-    - MagicCrystalHolder
-    - MagicArtifact1
-
-# Iron staff
-- type: entity
-  id: CP14MagicStaff_Iron
-  parent: CP14MagicStaffBase
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/iron_staff.rsi
-    layers:
-    - state: icon
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/iron_staff.rsi
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 1.05
-     Fire: 1.05
-     Gate: 1.05
-     Healing: 1.05
-     LightDarkness: 1.05
-     Meta: 1.05
-     Movement: 1.05
-     Water: 1.05
-     Necromancy: 1.05
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14MagicStaff_Iron
-    startSlots:
-    - MagicCrystalHolder
-    - MagicArtifact1
-
-# Gold staff
-- type: entity
-  id: CP14MagicStaff_Gold
-  parent: CP14MagicStaffBase
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/gold_staff.rsi
-    layers:
-    - state: icon
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    sprite: _CP14/Objects/ModularTools/Magic/Staffs/gold_staff.rsi
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14MagicStaff_Gold
-    startSlots:
-    - MagicCrystalHolder
-    - MagicArtifact1
-  - type: CP14MagicManacostModify
-    modifiers:
-     Earth: 1.05
-     Fire: 1.05
-     Gate: 1.05
-     Healing: 1.05
-     LightDarkness: 1.05
-     Meta: 1.05
-     Movement: 1.05
-     Water: 1.05
-     Necromancy: 1.05

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/janitor.yml

@@ -33,31 +33,4 @@
   - type: SolutionContainerManager
     solutions:
       absorbed:
-        maxVol: 50
-
-- type: entity
-  id: CP14BaseBroom
-  parent: 
-  - BaseItem
-  - CP14BaseWeaponDestructible
-  name: wooden broom
-  description: Sweeps up dried footprints and other stains from the floor
-  components:
-  - type: Item
-    size: Normal
-    storedRotation: 0
-    shape:
-    - 0,0,0,2
-    sprite: _CP14/Objects/Tools/broom.rsi
-  - type: Sprite
-    sprite: _CP14/Objects/Tools/broom.rsi
-    state: icon
-  - type: MeleeWeapon
-    wideAnimationRotation: 10
-    damage:
-      types:
-        Blunt: 5
-    soundHit:
-      collection: MetalThud
-  - type: CP14DecalCleaner
-    delay: 0.75
+        maxVol: 50

Resources/Prototypes/_CP14/Entities/Objects/ores.yml

@@ -17,7 +17,7 @@
   id: CP14OreCopper
   parent: CP14BaseOre
   name: copper ore
-  description: A piece of pale, heavy copper.
+  description: A piece of pale, heavy copper. 
   components:
   - type: Sprite
     sprite: _CP14/Objects/Materials/copper_ore.rsi
@@ -29,7 +29,7 @@
   id: CP14OreIron
   parent: CP14BaseOre
   name: iron ore
-  description: A piece of cold, heavy iron.
+  description: A piece of cold, heavy iron. 
   components:
   - type: Sprite
     sprite: _CP14/Objects/Materials/iron_ore.rsi
@@ -48,19 +48,3 @@
     layers:
       - state: ore1
         map: ["random"]
-
-- type: entity
-  id: CP14OreGlowingIron
-  parent: CP14BaseOre
-  name: glowing iron ore
-  description: A piece of soft, glowing iron.
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/glowingiron_ore.rsi
-    layers:
-      - state: ore1
-        map: ["random"]

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

@@ -0,0 +1,47 @@
+- type: entity
+  parent: BaseStructure
+  id: CP14Snowdrift
+  name: snowdrift
+  description: A big, cold pile of snow.
+  categories: [ ForkFiltered ]
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wall
+  components:
+  - type: PlacementReplacement
+    key: floorTile
+  - type: Sprite
+    sprite: _CP14/Structures/Flora/snowdrift.rsi
+    drawdepth: BelowFloor
+  - type: Icon
+    sprite: _CP14/Structures/Flora/snowdrift.rsi
+    state: full
+  - type: IconSmooth
+    key: CP14Snowdrift
+    base: state
+  - type: FloorOccluder
+  - type: Transform
+    anchored: true
+  - type: SpeedModifierContacts
+    walkSpeedModifier: 0.5
+    sprintSpeedModifier: 0.5
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        layer:
+          - SlipLayer
+        mask:
+          - ItemMask
+        density: 1000
+        hard: false
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepSnow
+      params:
+        volume: 8

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

@@ -15,7 +15,6 @@
   - type: Clickable
   - type: Sprite
     noRot: true
-    sprite: Objects/Decoration/Flora/flora_trees.rsi
     drawdepth: Mobs
     offset: 0,0.9
   - type: Physics
@@ -43,7 +42,7 @@
     - trigger:
         !type:DamageTypeTrigger
         damageType: Heat
-        damage: 100
+        damage: 50
       behaviors:
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
@@ -82,7 +81,6 @@
   abstract: true
   components:
   - type: Sprite
-    sprite: Objects/Decoration/Flora/flora_treeslarge.rsi
     offset: 0,1.55
   - type: Fixtures
     fixtures:
@@ -128,135 +126,57 @@
 
 - type: entity
   parent: CP14BaseTree
-  id: CP14FloraTree01
+  id: CP14FloraTreeGreen
   components:
   - type: Sprite
-    state: tree01
+    sprite: Objects/Decoration/Flora/flora_trees.rsi
+    layers:
+    - state: tree01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        tree01: ""
+        tree02: ""
+        tree03: ""
+        tree04: ""
+        tree05: ""
+        tree06: ""
 
 - type: entity
   parent: CP14BaseTree
-  id: CP14FloraTree02
+  id: CP14FloraTreeSnow
   components:
   - type: Sprite
-    state: tree02
-
-- type: entity
-  parent: CP14BaseTree
-  id: CP14FloraTree03
-  components:
-  - type: Sprite
-    state: tree03
-
-- type: entity
-  parent: CP14BaseTree
-  id: CP14FloraTree04
-  components:
-  - type: Sprite
-    state: tree04
-
-- type: entity
-  parent: CP14BaseTree
-  id: CP14FloraTree05
-  components:
-  - type: Sprite
-    state: tree05
-
-- type: entity
-  parent: CP14BaseTree
-  id: CP14FloraTree06
-  components:
-  - type: Sprite
-    state: tree06
+    sprite: _CP14/Structures/Flora/snow_trees.rsi
+    layers:
+    - state: tree01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        tree01: ""
+        tree02: ""
+        tree03: ""
+        tree04: ""
+        tree05: ""
+        tree06: ""
 
 - type: entity
   parent: CP14BaseTreeLarge
-  id: CP14FloraTreeLarge01
+  id: CP14FloraTreeGreenLarge
   components:
   - type: Sprite
-    state: treelarge01
-
-- type: entity
-  parent: CP14BaseTreeLarge
-  id: CP14FloraTreeLarge02
-  components:
-  - type: Sprite
-    state: treelarge02
-
-- type: entity
-  parent: CP14BaseTreeLarge
-  id: CP14FloraTreeLarge03
-  components:
-  - type: Sprite
-    state: treelarge03
-
-- type: entity
-  parent: CP14BaseTreeLarge
-  id: CP14FloraTreeLarge04
-  components:
-  - type: Sprite
-    state: treelarge04
-
-- type: entity
-  parent: CP14BaseTreeLarge
-  id: CP14FloraTreeLarge05
-  components:
-  - type: Sprite
-    state: treelarge05
-
-- type: entity
-  parent: CP14BaseTreeLarge
-  id: CP14FloraTreeLarge06
-  components:
-  - type: Sprite
-    state: treelarge06
-
-- type: entity
-  parent: CP14BaseTree
-  id: CP14FloraGlowingTree
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Structures/Flora/Trees/glowing_tree.rsi
-    state: tree1
-    drawdepth: Mobs
-    offset: 0,0.9
-  - 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:
-          CP14GlowingWoodLog:
-            min: 1
-            max: 2
-          CP14FoodGlowingFruit:
-            min: 1
-            max: 2
-
+    sprite: Objects/Decoration/Flora/flora_treeslarge.rsi
+    layers:
+    - state: treelarge01
+      map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        treelarge01: ""
+        treelarge02: ""
+        treelarge03: ""
+        treelarge04: ""
+        treelarge05: ""
+        treelarge06: ""

Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml

@@ -9,7 +9,6 @@
   components:
   - type: PlacementReplacement
     key: CP14Roof
-  - type: Clickable
   - type: Physics
     bodyType: Static
     canCollide: false

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

@@ -203,47 +203,6 @@
   - type: IconSmooth
     base: wall
 
-- type: entity
-  id: CP14WallStoneGlowingIronOre
-  suffix: glowing iron ore
-  parent: CP14WallStone
-  description: A solid stone natural wall. You see the shining particles in it.
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Sprite
-    sprite: _CP14/Structures/Walls/Natural/cave_stone_glowingiron.rsi
-  - type: Icon
-    sprite: _CP14/Structures/Walls/Natural/cave_stone_glowingiron.rsi
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 300
-      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:
-          CP14OreGlowingIron:
-            min: 1
-            max: 3
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: IconSmooth
-    base: wall
-
 # We dont have silver now
 
 #- type: entity

Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml

@@ -1,23 +1,21 @@
 - type: entity
-  id: CP14DungeonEntrance
+  id: CP14LaddersDownBase
   name: stairway down
-  categories: [ HideSpawnMenu ]
+  abstract: true
+  categories: [ ForkFiltered, HideSpawnMenu ]
   description: The dark depths of the underworld are calling you.
   placement:
     mode: SnapgridCenter
   components:
+  - type: Sprite
+    drawdepth: FloorTiles
+    sprite: /Textures/_CP14/Structures/Dungeon/ladders.rsi
   - type: Transform
     anchored: True
   - type: InteractionOutline
   - type: Clickable
   - type: Physics
     bodyType: Static
-  - type: Sprite
-    sprite: /Textures/_CP14/Structures/Dungeon/ladders.rsi
-    drawdepth: FloorTiles
-    layers:
-    - state: ladder
-    #- state: down
   - type: Fixtures
     fixtures:
       portalFixture:
@@ -34,18 +32,16 @@
     randomTeleport: false
 
 - type: entity
-  parent: CP14DungeonEntrance
-  id: CP14DungeonExit
+  parent: CP14LaddersDownBase
+  id: CP14LaddersUpBase
+  abstract: true
+  categories: [ ForkFiltered, HideSpawnMenu ]
   name: stairway up
-  categories: [ HideSpawnMenu ]
   description: A way out of the dark underworld into the overworld.
   components:
   - type: Sprite
     sprite: /Textures/_CP14/Structures/Dungeon/ladders_up.rsi
     drawdepth: Mobs
-    layers:
-    - state: ladder
-    #- state: top
   - type: Fixtures
     fixtures:
       portalFixture:
@@ -63,20 +59,113 @@
     energy: 1
     netsync: false
 
+
+# Basic stone
 - type: entity
-  parent: CP14DungeonEntrance
-  id: CP14DungeonEntranceAutoLink
-  categories: [ ForkFiltered ]
+  parent: CP14LaddersDownBase
+  id: CP14LaddersDownStone
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    state: stone
+
+- type: entity
+  parent: CP14LaddersUpBase
+  id: CP14LaddersUpStone
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    state: stone
+
+
+- type: entity
+  parent: CP14LaddersDownStone
+  id: CP14LaddersDownStoneAutoLink
+  suffix: Stone
   components:
   - type: CP14ZLevelAutoPortal
     zLevelOffset: -1 # Go into deep
-    otherSideProto: CP14DungeonExit
+    otherSideProto: CP14LaddersUpStone
 
 - type: entity
-  parent: CP14DungeonExit
-  id: CP14DungeonExitAutoLink
-  categories: [ ForkFiltered ]
+  parent: CP14LaddersUpStone
+  id: CP14LaddersUpStoneAutoLink
+  suffix: Stone
   components:
   - type: CP14ZLevelAutoPortal
     zLevelOffset: 1 # Go onto surface
-    otherSideProto: CP14DungeonEntrance
+    otherSideProto: CP14LaddersDownStone
+
+
+# Wood
+- type: entity
+  parent: CP14LaddersDownBase
+  id: CP14LaddersDownWood
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    state: wood
+
+- type: entity
+  parent: CP14LaddersUpBase
+  id: CP14LaddersUpWood
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    state: wood
+
+
+- type: entity
+  parent: CP14LaddersDownWood
+  id: CP14LaddersDownWoodAutoLink
+  suffix: Wood
+  components:
+  - type: CP14ZLevelAutoPortal
+    zLevelOffset: -1 # Go into deep
+    otherSideProto: CP14LaddersUpWood
+
+- type: entity
+  parent: CP14LaddersUpWood
+  id: CP14LaddersUpWoodAutoLink
+  suffix: Wood
+  components:
+  - type: CP14ZLevelAutoPortal
+    zLevelOffset: 1 # Go onto surface
+    otherSideProto: CP14LaddersDownWood
+
+
+# Wood
+- type: entity
+  parent: CP14LaddersDownBase
+  id: CP14LaddersDownMarble
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    state: marble
+
+- type: entity
+  parent: CP14LaddersUpBase
+  id: CP14LaddersUpMarble
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    state: marble
+
+
+- type: entity
+  parent: CP14LaddersDownMarble
+  id: CP14LaddersDownMarbleAutoLink
+  suffix: Marble
+  components:
+  - type: CP14ZLevelAutoPortal
+    zLevelOffset: -1 # Go into deep
+    otherSideProto: CP14LaddersUpMarble
+
+- type: entity
+  parent: CP14LaddersUpWood
+  id: CP14LaddersUpMarbleAutoLink
+  suffix: Marble
+  components:
+  - type: CP14ZLevelAutoPortal
+    zLevelOffset: 1 # Go onto surface
+    otherSideProto: CP14LaddersDownMarble

Resources/Prototypes/_CP14/Materials/simple.yml

@@ -78,21 +78,3 @@
   icon: { sprite: _CP14/Objects/Materials/flora.rsi, state: grass_material1 }
   color: "#85903e"
   price: 0 #?
-
-- type: material
-  id: CP14GlowingIron
-  stackEntity: CP14GlowingIronBar1
-  name: cp14-material-glowing-iron
-  unit: materials-unit-bar
-  icon: { sprite: _CP14/Objects/Materials/glowingiron_bar.rsi, state: bar_2 }
-  color: "#87CEEB"
-  price: 0 #?
-
-- type: material
-  id: CP14GlowingWoodenPlanks
-  stackEntity: CP14GlowingWoodenPlanks1
-  name: cp14-material-glowing-wooden-planks
-  unit: materials-unit-plank
-  icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 }
-  color: "#874d3a"
-  price: 0 #?

Resources/Prototypes/_CP14/ModularCraft/Magic/magic_artifacts.yml

@@ -1,251 +0,0 @@
-# Earth
-- type: modularPart
-  id: MagicArtifact_Earth5
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Earth5
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Earth: 0.95
-
-- type: modularPart
-  id: MagicArtifact_Earth10
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Earth10
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Earth: 0.90
-
-- type: modularPart
-  id: MagicArtifact_Earth15
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Earth15
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Earth: 0.85
-
-# Fire
-- type: modularPart
-  id: MagicArtifact_Fire5
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Fire5
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Fire: 0.95
-
-- type: modularPart
-  id: MagicArtifact_Fire10
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Fire10
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Fire: 0.90
-
-- type: modularPart
-  id: MagicArtifact_Fire15
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Fire15
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Fire: 0.85
-
-# Gate
-- type: modularPart
-  id: MagicArtifact_Gate5
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Gate5
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Gate: 0.95
-
-- type: modularPart
-  id: MagicArtifact_Gate10
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Gate10
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Gate: 0.90
-
-- type: modularPart
-  id: MagicArtifact_Gate15
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Gate15
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Gate: 0.85
-
-# Healing
-- type: modularPart
-  id: MagicArtifact_Healing5
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Healing5
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Healing: 0.95
-
-- type: modularPart
-  id: MagicArtifact_Healing10
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Healing10
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Healing: 0.90
-
-- type: modularPart
-  id: MagicArtifact_Healing15
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Healing15
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Healing: 0.85
-
-# LightDarkness
-- type: modularPart
-  id: MagicArtifact_LightDarkness5
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_LightDarkness5
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     LightDarkness: 0.95
-
-- type: modularPart
-  id: MagicArtifact_LightDarkness10
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_LightDarkness10
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     LightDarkness: 0.90
-
-- type: modularPart
-  id: MagicArtifact_LightDarkness15
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_LightDarkness15
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     LightDarkness: 0.85
-
-# Meta
-- type: modularPart
-  id: MagicArtifact_Meta5
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Meta5
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Meta: 0.95
-
-- type: modularPart
-  id: MagicArtifact_Meta10
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Meta10
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Meta: 0.90
-
-- type: modularPart
-  id: MagicArtifact_Meta15
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Meta15
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Meta: 0.85
-
-# Movement
-- type: modularPart
-  id: MagicArtifact_Movement5
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Movement5
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Movement: 0.95
-
-- type: modularPart
-  id: MagicArtifact_Movement10
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Movement10
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Movement: 0.90
-
-- type: modularPart
-  id: MagicArtifact_Movement15
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Movement15
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Movement: 0.85
-
-# Water
-- type: modularPart
-  id: MagicArtifact_Water5
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Water5
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Water: 0.95
-
-- type: modularPart
-  id: MagicArtifact_Water10
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Water10
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Water: 0.90
-
-- type: modularPart
-  id: MagicArtifact_Water15
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Water15
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Water: 0.85
-
-# Necromancy
-- type: modularPart
-  id: MagicArtifact_Necromancy5
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Necromancy5
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Necromancy: 0.95
-
-- type: modularPart
-  id: MagicArtifact_Necromancy10
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Necromancy10
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Necromancy: 0.90
-
-- type: modularPart
-  id: MagicArtifact_Necromancy15
-  targetSlot: MagicArtifact1
-  sourcePart: CP14OldMagicScroll_Necromancy15
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Necromancy: 0.85

Resources/Prototypes/_CP14/ModularCraft/Magic/magic_crystal_holder.yml

@@ -1,343 +0,0 @@
-# Blue Holders
-- type: modularPart
-  id: BaseBlueHolderManacostModify
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Earth: 0.95
-     Fire: 0.95
-     Gate: 0.95
-     Healing: 0.95
-     LightDarkness: 0.95
-     Meta: 0.95
-     Movement: 0.95
-     Water: 0.95
-     Necromancy: 0.95
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Blue1
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Blue1
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi
-      state: icon1
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-  - !type:Inherit
-    copyFrom:
-    - BaseBlueHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Blue2
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Blue2
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi
-      state: icon2
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal3
-  - !type:Inherit
-    copyFrom:
-    - BaseBlueHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Blue3
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Blue3
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi
-      state: icon3
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal2
-    - HolderMagicCrystal4
-  - !type:Inherit
-    copyFrom:
-    - BaseBlueHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Blue4
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Blue4
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi
-      state: icon4
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_blue.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal2
-    - HolderMagicCrystal3
-    - HolderMagicCrystal4
-  - !type:Inherit
-    copyFrom:
-    - BaseBlueHolderManacostModify
-
-# Cooper Holders
-- type: modularPart
-  id: BaseCooperHolderManacostModify
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Earth: 1.05
-     Fire: 1.05
-     Gate: 1.05
-     Healing: 1.05
-     LightDarkness: 1.05
-     Meta: 1.05
-     Movement: 1.05
-     Water: 1.05
-     Necromancy: 1.05
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Cooper1
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Cooper1
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_cooper.rsi
-      state: icon1
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_cooper.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-  - !type:Inherit
-    copyFrom:
-    - BaseCooperHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Cooper2
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Cooper2
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_cooper.rsi
-      state: icon2
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_cooper.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal3
-  - !type:Inherit
-    copyFrom:
-    - BaseCooperHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Cooper3
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Cooper3
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_cooper.rsi
-      state: icon3
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_cooper.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal2
-    - HolderMagicCrystal4
-  - !type:Inherit
-    copyFrom:
-    - BaseCooperHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Cooper4
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Cooper4
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_cooper.rsi
-      state: icon4
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_cooper.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal2
-    - HolderMagicCrystal3
-    - HolderMagicCrystal4
-  - !type:Inherit
-    copyFrom:
-    - BaseCooperHolderManacostModify
-
-# Iron Holders
-- type: modularPart
-  id: BaseIronHolderManacostModify
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Earth: 1.05
-     Fire: 1.05
-     Gate: 1.05
-     Healing: 1.05
-     LightDarkness: 1.05
-     Meta: 1.05
-     Movement: 1.05
-     Water: 1.05
-     Necromancy: 1.05
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Iron1
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Iron1
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_iron.rsi
-      state: icon1
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_iron.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-  - !type:Inherit
-    copyFrom:
-    - BaseIronHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Iron2
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Iron2
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_iron.rsi
-      state: icon2
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_iron.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal3
-  - !type:Inherit
-    copyFrom:
-    - BaseIronHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Iron3
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Iron3
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_iron.rsi
-      state: icon3
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_iron.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal2
-    - HolderMagicCrystal4
-  - !type:Inherit
-    copyFrom:
-    - BaseIronHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Iron4
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Iron4
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_iron.rsi
-      state: icon4
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_iron.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal2
-    - HolderMagicCrystal3
-    - HolderMagicCrystal4
-  - !type:Inherit
-    copyFrom:
-    - BaseIronHolderManacostModify
-
-# Gold Holders
-- type: modularPart
-  id: BaseGoldHolderManacostModify
-  modifiers:
-  - !type:EditManacostModify
-    modifiers:
-     Earth: 1.05
-     Fire: 1.05
-     Gate: 1.05
-     Healing: 1.05
-     LightDarkness: 1.05
-     Meta: 1.05
-     Movement: 1.05
-     Water: 1.05
-     Necromancy: 1.05
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Gold1
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Gold1
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_gold.rsi
-      state: icon1
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_gold.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-  - !type:Inherit
-    copyFrom:
-    - BaseGoldHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Gold2
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Gold2
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_gold.rsi
-      state: icon2
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_gold.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal3
-  - !type:Inherit
-    copyFrom:
-    - BaseGoldHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Gold3
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Gold3
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_gold.rsi
-      state: icon3
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_gold.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal2
-    - HolderMagicCrystal4
-  - !type:Inherit
-    copyFrom:
-    - BaseGoldHolderManacostModify
-
-- type: modularPart
-  id: StaffMagicCrystalHolder_Gold4
-  targetSlot: MagicCrystalHolder
-  sourcePart: CP14MagicCrystalHolder_Gold4
-  iconSprite:
-    - sprite: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_gold.rsi
-      state: icon4
-  rsiPath: _CP14/Objects/ModularTools/Magic/Holders/magic_crystals_holder_gold.rsi
-  modifiers:
-  - !type:EditModularSlots
-    addSlots:
-    - HolderMagicCrystal1
-    - HolderMagicCrystal2
-    - HolderMagicCrystal3
-    - HolderMagicCrystal4
-  - !type:Inherit
-    copyFrom:
-    - BaseGoldHolderManacostModify

Resources/Prototypes/_CP14/ModularCraft/slots.yml

@@ -2,38 +2,6 @@
   id: Blade
   name: cp14-modular-slot-blade
 
-- type: modularSlot
-  id: HolderMagicCrystal1
-  name: cp14-modular-slot-magical-crystal
-
-- type: modularSlot
-  id: HolderMagicCrystal2
-  name: cp14-modular-slot-magical-crystal
-
-- type: modularSlot
-  id: HolderMagicCrystal3
-  name: cp14-modular-slot-magical-crystal
-
-- type: modularSlot
-  id: HolderMagicCrystal4
-  name: cp14-modular-slot-magic-crystal
-
-- type: modularSlot
-  id: MagicCrystalHolder
-  name: cp14-modular-slot-magic-crystal-holder
-
 - type: modularSlot
   id: Garde
-  name: cp14-modular-slot-garde
-
-- type: modularSlot
-  id: RingMagicCrystal1
-  name: cp14-modular-slot-magical-crystal
-
-- type: modularSlot
-  id: MagicArtifact1
-  name: cp14-modular-slot-magic-artifact
-
-- type: modularSlot
-  id: StaffHolderMagicCrystal1
-  name: cp14-modular-slot-magic-crystal
+  name: cp14-modular-slot-garde

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml

@@ -7,7 +7,7 @@
   - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
-      entityMask:
+      entityMask: 
       - CP14WallStone
       entity: CP14WallStoneGoldOre # Hellish gold 666
       count: 6
@@ -23,7 +23,7 @@
   - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
-      entityMask:
+      entityMask: 
       - CP14WallStone
       entity: CP14WallStoneIronOre
       count: 5
@@ -39,7 +39,7 @@
   - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
-      entityMask:
+      entityMask: 
       - CP14WallStone
       entity: CP14WallStoneCopperOre
       count: 10
@@ -54,7 +54,7 @@
   - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorBase
       entity: CP14QuartzCrystal
       count: 10
@@ -71,7 +71,7 @@
   - CP14DemiplaneUnderground
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorBase
       entity: CP14CrystalRubiesMedium
       count: 30
@@ -87,7 +87,7 @@
   - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorBase
       - CP14FloorSand
       entity: CP14CrystalTopazesMedium
@@ -104,7 +104,7 @@
   - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorBase
       - CP14FloorGrass
       - CP14FloorGrassLight
@@ -123,7 +123,7 @@
   - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorBase
       - CP14FloorGrass
       - CP14FloorGrassLight
@@ -143,7 +143,7 @@
   - CP14DemiplaneUnderground
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorBase
       entity: CP14CrystalAmethystsMedium
       count: 30
@@ -160,7 +160,7 @@
   - CP14DemiplaneUnderground
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorBase
       - CP14FloorSand
       entity: CP14CrystalDiamondsMedium
@@ -177,7 +177,7 @@
   - CP14DemiplaneOpenSky
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorGrass
       - CP14FloorGrassLight
       - CP14FloorGrassTall
@@ -194,7 +194,7 @@
   - CP14DemiplaneGrass
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorBase
       - CP14FloorGrass
       - CP14FloorGrassLight
@@ -212,7 +212,7 @@
   - CP14DemiplaneGrass
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorGrass
       - CP14FloorGrassLight
       - CP14FloorGrassTall
@@ -229,7 +229,7 @@
   - CP14DemiplaneGrass
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorGrass
       - CP14FloorGrassLight
       - CP14FloorGrassTall
@@ -247,7 +247,7 @@
   - CP14DemiplaneOpenSky
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorGrass
       - CP14FloorGrassLight
       - CP14FloorGrassTall
@@ -264,7 +264,7 @@
   - CP14DemiplaneUnderground
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorGrass
       - CP14FloorGrassLight
       - CP14FloorGrassTall
@@ -400,7 +400,7 @@
   - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorBase
       entity: CP14MobMonsterMole
       count: 6
@@ -416,7 +416,7 @@
   - CP14DemiplaneGrass
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorGrass
       - CP14FloorGrassLight
       - CP14FloorGrassTall
@@ -435,7 +435,7 @@
   - CP14DemiplaneGrass
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorGrass
       - CP14FloorGrassLight
       - CP14FloorGrassTall
@@ -467,7 +467,7 @@
   - CP14DemiplaneOpenSky
   layers:
     - !type:OreDunGen
-      tileMask:
+      tileMask: 
       - CP14FloorGrass
       - CP14FloorGrassLight
       - CP14FloorGrassTall

Resources/Prototypes/_CP14/Procedural/biome_template_grasslands.yml

@@ -126,18 +126,8 @@
         - CP14FloorGrassLight
         - CP14FloorGrassTall
       entities: 
-        - CP14FloraTree01
-        - CP14FloraTree02
-        - CP14FloraTree03
-        - CP14FloraTree04
-        - CP14FloraTree05
-        - CP14FloraTree06
-        - CP14FloraTreeLarge01
-        - CP14FloraTreeLarge02
-        - CP14FloraTreeLarge03
-        - CP14FloraTreeLarge04
-        - CP14FloraTreeLarge05
-        - CP14FloraTreeLarge06
+        - CP14FloraTreeGreen
+        - CP14FloraTreeGreenLarge
     - !type:BiomeEntityLayer # More Rocks
       threshold: 0.7
       noise:
@@ -184,18 +174,8 @@
         - CP14FloorGrassLight
         - CP14FloorGrassTall
       entities:
-        - CP14FloraTree01
-        - CP14FloraTree02
-        - CP14FloraTree03
-        - CP14FloraTree04
-        - CP14FloraTree05
-        - CP14FloraTree06
-        - CP14FloraTreeLarge01
-        - CP14FloraTreeLarge02
-        - CP14FloraTreeLarge03
-        - CP14FloraTreeLarge04
-        - CP14FloraTreeLarge05
-        - CP14FloraTreeLarge06
+        - CP14FloraTreeGreen
+        - CP14FloraTreeGreenLarge
 
 - type: biomeTemplate
   id: CP14GrasslandHills # Холмы

Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml

@@ -0,0 +1,70 @@
+- type: biomeTemplate
+  id: CP14SnowFill
+  layers:
+    - !type:BiomeTileLayer
+      threshold: -1.0
+      tile: CP14FloorSnowDeepDeep
+    - !type:BiomeTileLayer 
+      tile: CP14FloorSnowDeep
+      threshold: 0
+      noise:
+        seed: 0
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        frequency: 0.02
+        octaves: 3
+        lacunarity: 1.8
+        gain: 0.7
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 120
+    - !type:BiomeTileLayer
+      tile: CP14FloorSnow
+      threshold: 0.45
+      noise:
+        seed: 0
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        frequency: 0.02
+        octaves: 3
+        lacunarity: 1.8
+        gain: 0.7
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 120
+
+- type: biomeTemplate
+  id: CP14Snowland
+  layers:
+    - !type:BiomeMetaLayer
+      template: CP14SnowFill
+    - !type:BiomeEntityLayer # More Trees
+      threshold: 0.4
+      noise:
+        seed: 4
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 0.7
+      allowedTiles:
+        - CP14FloorSnow
+        - CP14FloorSnowDeep
+        - CP14FloorSnowDeepDeep
+      entities:
+        - CP14FloraTreeSnow
+        #- CP14FloraTreeGreenLarge
+    - !type:BiomeEntityLayer # Snowdrifts
+      threshold: 0.3
+      noise:
+        seed: 23
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        frequency: 0.05
+        octaves: 3
+        lacunarity: 1.8
+        gain: 0.7
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 120
+      allowedTiles:
+        - CP14FloorSnow
+        - CP14FloorSnowDeep
+        - CP14FloorSnowDeepDeep
+      entities:
+        - CP14Snowdrift

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

@@ -384,205 +384,4 @@
   craftTime: 4
   stacks:
     CP14GoldBar: 2
-  result: CP14ModularBladeGoldAxe
-
-- type: CP14Recipe
-  id: CP14ClothingMagicRingBlue
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GlowingIronBar: 1
-  result: CP14ClothingMagicRingBlue
-
-- type: CP14Recipe
-  id: CP14ClothingMagicRingCooper
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14CopperBar: 1
-  result: CP14ClothingMagicRingCooper
-
-- type: CP14Recipe
-  id: CP14ClothingMagicRingIron
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14IronBar: 1
-  result: CP14ClothingMagicRingIron
-
-- type: CP14Recipe
-  id: CP14ClothingMagicRingGold
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 1
-  result: CP14ClothingMagicRingGold
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Blue1
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GlowingIronBar: 1
-  result: CP14MagicCrystalHolder_Blue1
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Blue2
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GlowingIronBar: 2
-  result: CP14MagicCrystalHolder_Blue2
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Blue3
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GlowingIronBar: 3
-  result: CP14MagicCrystalHolder_Blue3
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Blue4
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GlowingIronBar: 4
-  result: CP14MagicCrystalHolder_Blue4
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Cooper1
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14CopperBar: 1
-  result: CP14MagicCrystalHolder_Cooper1
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Cooper2
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14CopperBar: 2
-  result: CP14MagicCrystalHolder_Cooper2
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Cooper3
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14CopperBar: 3
-  result: CP14MagicCrystalHolder_Cooper3
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Cooper4
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14CopperBar: 4
-  result: CP14MagicCrystalHolder_Cooper4
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Iron1
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14IronBar: 1
-  result: CP14MagicCrystalHolder_Iron1
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Iron2
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14IronBar: 2
-  result: CP14MagicCrystalHolder_Iron2
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Iron3
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14IronBar: 3
-  result: CP14MagicCrystalHolder_Iron3
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Iron4
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14IronBar: 4
-  result: CP14MagicCrystalHolder_Iron4
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Gold1
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 1
-  result: CP14MagicCrystalHolder_Gold1
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Gold2
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 2
-  result: CP14MagicCrystalHolder_Gold2
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Gold3
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 3
-  result: CP14MagicCrystalHolder_Gold3
-
-- type: CP14Recipe
-  id: CP14MagicCrystalHolder_Gold4
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 4
-  result: CP14MagicCrystalHolder_Gold4
-
-- type: CP14Recipe
-  id: CP14MagicStaff_GlowingIron
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GlowingIronBar: 2
-  result: CP14MagicStaff_GlowingIron
-
-- type: CP14Recipe
-  id: CP14MagicStaff_GlowingIronHolder
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GlowingIronBar: 2
-    CP14IronBar: 1
-  result: CP14MagicStaff_GlowingIronHolder
-
-- type: CP14Recipe
-  id: CP14MagicStaff_Cooper
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14CopperBar: 2
-  result: CP14MagicStaff_Cooper
-
-- type: CP14Recipe
-  id: CP14MagicStaff_Iron
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14IronBar: 2
-  result: CP14MagicStaff_Iron
-
-- type: CP14Recipe
-  id: CP14MagicStaff_Gold
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 2
-  result: CP14MagicStaff_Gold
+  result: CP14ModularBladeGoldAxe

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

@@ -28,12 +28,4 @@
   craftTime: 4
   entities:
     CP14QuartzShard: 1
-  result: CP14GlassSheet1
-
-- type: CP14Recipe
-  id: CP14GlowingIron1
-  tag: CP14RecipeMeltingFurnace
-  craftTime: 4
-  entities:
-    CP14OreGlowingIron: 4
-  result: CP14GlowingIronBar1
+  result: CP14GlassSheet1

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

@@ -34,16 +34,6 @@
     CP14Cloth: 1
   result: CP14BaseMop
 
-- type: CP14Recipe
-  id: CP14BaseBroom
-  tag: CP14RecipeWorkbench
-  craftTime: 3
-  entities:
-    CP14Wheat: 2
-  stacks:
-    CP14WoodenPlanks: 2
-  result: CP14BaseBroom
-
 - type: CP14Recipe
   id: CP14BaseBattleStaff
   tag: CP14RecipeWorkbench
@@ -85,19 +75,3 @@
   stacks:
     CP14WoodenPlanks: 2
   result: CP14ModularGripWoodenLong
-
-- type: CP14Recipe
-  id: CP14MagicStaff_GlowingWooden
-  tag: CP14RecipeWorkbench
-  craftTime: 2
-  stacks:
-    CP14GlowingWoodenPlanks: 2
-  result: CP14MagicStaff_GlowingWooden
-
-- type: CP14Recipe
-  id: CP14MagicStaff_Wooden
-  tag: CP14RecipeWorkbench
-  craftTime: 2
-  stacks:
-    CP14WoodenPlanks: 2
-  result: CP14MagicStaff_Wooden

Resources/Prototypes/_CP14/SoundCollections/items.yml

@@ -29,13 +29,6 @@
   - /Audio/_CP14/Items/sawing3.ogg
   - /Audio/_CP14/Items/sawing4.ogg
   - /Audio/_CP14/Items/sawing5.ogg
-  
-- type: soundCollection
-  id: CP14Broom
-  files:
-  - /Audio/_CP14/Items/broom1.ogg
-  - /Audio/_CP14/Items/broom2.ogg
-  - /Audio/_CP14/Items/broom3.ogg
 
 - type: soundCollection
   id: CP14Parry

Resources/Prototypes/_CP14/Stacks/materials.yml

@@ -67,17 +67,3 @@
   icon: { sprite: "_CP14/Objects/Materials/flora.rsi", state: grass_material1 }
   spawn: CP14FloraMaterial1
   maxCount: 2
-
-- type: stack
-  id: CP14GlowingIronBar
-  name: cp14-stack-glowing-iron-bars
-  spawn: CP14GlowingIronBar1
-  icon: { sprite: _CP14/Objects/Materials/glowingiron_bar.rsi, state: bar_2 }
-  maxCount: 10
-
-- type: stack
-  id: CP14GlowingWoodenPlanks
-  name: cp14-stack-glowing-wood-planks
-  spawn: CP14GlowingWoodenPlanks1
-  icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 }
-  maxCount: 10

Resources/Prototypes/_CP14/Tiles/base.yml

@@ -37,5 +37,4 @@
     collection: FootstepAsteroid
   heatCapacity: 10000
   weather: true
-  color: "#38373b"
   indestructible: true

Resources/Prototypes/_CP14/Tiles/natural.yml

@@ -40,7 +40,6 @@
   heatCapacity: 10000
   weather: true
   suckReagents: true
-  color: "#452f27"
 
 - type: tile
   editorHidden: false
@@ -73,7 +72,6 @@
   heatCapacity: 10000
   weather: true
   suckReagents: true
-  color: "#dccd9e"
 
 - type: tile
   id: CP14FloorGrass
@@ -107,7 +105,6 @@
   heatCapacity: 10000
   weather: true
   suckReagents: true
-  color: "#4a613a"
 
 - type: tile
   id: CP14FloorGrassLight
@@ -141,7 +138,6 @@
   heatCapacity: 10000
   weather: true
   suckReagents: true
-  color: "#4a613a"
 
 - type: tile
   id: CP14FloorGrassTall
@@ -175,4 +171,102 @@
   heatCapacity: 10000
   weather: true
   suckReagents: true
-  color: "#4a613a"
+
+- type: tile
+  id: CP14FloorSnowDeepDeep
+  editorHidden: false
+  name: cp14-tiles-snow-deep-deep
+  sprite: /Textures/_CP14/Tiles/SnowDeepDeep/snow.png
+  variants: 6
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  edgeSpritePriority: 1000 # Because snowfall!
+  edgeSprites:
+    SouthEast: /Textures/_CP14/Tiles/SnowDeepDeep/single_edge_SE.png
+    NorthEast: /Textures/_CP14/Tiles/SnowDeepDeep/single_edge_NE.png
+    NorthWest: /Textures/_CP14/Tiles/SnowDeepDeep/single_edge_NW.png
+    SouthWest: /Textures/_CP14/Tiles/SnowDeepDeep/single_edge_SW.png
+    South: /Textures/_CP14/Tiles/SnowDeepDeep/double_edge_S.png
+    East: /Textures/_CP14/Tiles/SnowDeepDeep/double_edge_E.png
+    North: /Textures/_CP14/Tiles/SnowDeepDeep/double_edge_N.png
+    West: /Textures/_CP14/Tiles/SnowDeepDeep/double_edge_W.png
+  baseTurf: CP14FloorDirt
+  deconstructTools: [ CP14Digging ]
+  itemDrop: CP14RandomDirtLootSpawner
+  isSubfloor: false
+  footstepSounds:
+    collection: FootstepSnow
+  heatCapacity: 10000
+  weather: true
+  suckReagents: true
+
+- type: tile
+  id: CP14FloorSnowDeep
+  editorHidden: false
+  name: cp14-tiles-snow-deep
+  sprite: /Textures/_CP14/Tiles/SnowDeep/snow.png
+  variants: 6
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  edgeSpritePriority: 1001 # Because snowfall!
+  edgeSprites:
+    SouthEast: /Textures/_CP14/Tiles/SnowDeep/single_edge_SE.png
+    NorthEast: /Textures/_CP14/Tiles/SnowDeep/single_edge_NE.png
+    NorthWest: /Textures/_CP14/Tiles/SnowDeep/single_edge_NW.png
+    SouthWest: /Textures/_CP14/Tiles/SnowDeep/single_edge_SW.png
+    South: /Textures/_CP14/Tiles/SnowDeep/double_edge_S.png
+    East: /Textures/_CP14/Tiles/SnowDeep/double_edge_E.png
+    North: /Textures/_CP14/Tiles/SnowDeep/double_edge_N.png
+    West: /Textures/_CP14/Tiles/SnowDeep/double_edge_W.png
+  baseTurf: CP14FloorDirt
+  deconstructTools: [ CP14Digging ]
+  itemDrop: CP14RandomDirtLootSpawner
+  isSubfloor: false
+  footstepSounds:
+    collection: FootstepSnow
+  heatCapacity: 10000
+  weather: true
+  suckReagents: true
+
+- type: tile
+  id: CP14FloorSnow
+  editorHidden: false
+  name: cp14-tiles-snow
+  sprite: /Textures/_CP14/Tiles/Snow/snow.png
+  variants: 6
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  edgeSpritePriority: 1002 # Because snowfall!
+  edgeSprites:
+    SouthEast: /Textures/_CP14/Tiles/Snow/single_edge_SE.png
+    NorthEast: /Textures/_CP14/Tiles/Snow/single_edge_NE.png
+    NorthWest: /Textures/_CP14/Tiles/Snow/single_edge_NW.png
+    SouthWest: /Textures/_CP14/Tiles/Snow/single_edge_SW.png
+    South: /Textures/_CP14/Tiles/Snow/double_edge_S.png
+    East: /Textures/_CP14/Tiles/Snow/double_edge_E.png
+    North: /Textures/_CP14/Tiles/Snow/double_edge_N.png
+    West: /Textures/_CP14/Tiles/Snow/double_edge_W.png
+  baseTurf: CP14FloorDirt
+  deconstructTools: [ CP14Digging ]
+  itemDrop: CP14RandomDirtLootSpawner
+  isSubfloor: false
+  footstepSounds:
+    collection: FootstepSnow
+  heatCapacity: 10000
+  weather: true
+  suckReagents: true

Resources/Prototypes/_CP14/Tiles/woodplanks.yml

@@ -1281,7 +1281,6 @@
     collection: FootstepWood
   heatCapacity: 10000
   weather: true
-  color: "#0d0906"
 
 - type: tile #Big
   editorHidden: false
@@ -1305,7 +1304,6 @@
     collection: FootstepWood
   heatCapacity: 10000
   weather: true
-  color: "#0d0906"
   
 - type: tile #Cruci
   editorHidden: false
@@ -1329,7 +1327,6 @@
     collection: FootstepWood
   heatCapacity: 10000
   weather: true
-  color: "#0d0906"
   
 - type: tile #Stairways
   editorHidden: false
@@ -1353,6 +1350,5 @@
     collection: FootstepWood
   heatCapacity: 10000
   weather: true
-  color: "#0d0906"
 ### /BURNED
 

Resources/Textures/_CP14/Clothing/Rings/rings.rsi/meta.json

@@ -10,18 +10,6 @@
         {
             "name": "brass_ring"
         },
-        {
-            "name": "blue_ring"
-        },
-        {
-            "name": "cooper_ring"
-        },
-        {
-            "name": "iron_ring"
-        },
-        {
-            "name": "gold_ring"
-        },
         {
             "name": "saphhire_stone_small"
         },

Resources/Textures/_CP14/Decals/footprints.rsi/meta.json

@@ -1,17 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CLA",
-    "copyright": "Created by TheShuEd",
-    "states": [
-        {
-            "name": "boots"
-        },
-        {
-            "name": "footprint"
-        }
-    ]
-}

Resources/Textures/_CP14/Interface/Alerts/vanilla/bleed.rsi/meta.json

@@ -1,11 +1,11 @@
 {
   "version": 1,
   "size": {
-    "x": 48,
-    "y": 48
+    "x": 32,
+    "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": " by vladimir.s",
+  "copyright": "Edited by Flareguy for Space Station 14, original sprite taken from https://github.com/tgstation/tgstation/blob/master/icons/effects/bleed.dmi",
   "states": [
     {
       "name": "bleed0"

Resources/Textures/_CP14/Interface/Alerts/vanilla/stamina.rsi/meta.json

@@ -1,10 +1,10 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0, modified by vladimir.s",
+    "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0",
     "size": {
-        "x": 48,
-        "y": 48
+        "x": 32,
+        "y": 32
     },
     "states": [
         {

Resources/Textures/_CP14/Interface/Alerts/vanilla/temperature.rsi/meta.json

@@ -1 +1 @@
-{"version": 1, "size": {"x": 48, "y": 48}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 1c7401722f397d8ac8afdd10e550c5962e0f38d4, modified by vladimir.s", "states": [{"name": "cold1", "directions": 1, "delays": [[1.0]]}, {"name": "cold2", "directions": 1, "delays": [[1.0]]}, {"name": "cold3", "directions": 1, "delays": [[0.3, 0.3]]}, {"name": "hot1", "directions": 1, "delays": [[1.0]]}, {"name": "hot2", "directions": 1, "delays": [[1.0]]}, {"name": "hot3", "directions": 1, "delays": [[0.3, 0.3]]}]}
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 1c7401722f397d8ac8afdd10e550c5962e0f38d4", "states": [{"name": "cold1", "directions": 1, "delays": [[1.0]]}, {"name": "cold2", "directions": 1, "delays": [[1.0]]}, {"name": "cold3", "directions": 1, "delays": [[0.3, 0.3]]}, {"name": "hot1", "directions": 1, "delays": [[1.0]]}, {"name": "hot2", "directions": 1, "delays": [[1.0]]}, {"name": "hot3", "directions": 1, "delays": [[0.3, 0.3]]}]}

Resources/Textures/_CP14/Markers/biome.rsi/meta.json

@@ -18,6 +18,9 @@
     },
     {
       "name": "forest"
+    },
+    {
+      "name": "snow"
     }
   ]
 }