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.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;
 

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/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/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/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/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,84 +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
+    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/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/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/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

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/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/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"
     }
   ]
 }

Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/meta.json

@@ -8,14 +8,16 @@
   },
   "states": [
     {
-      "name": "ladder",
+      "name": "marble",
       "directions": 4
     },
     {
-      "name": "top"
+      "name": "stone",
+      "directions": 4
     },
     {
-      "name": "down"
+      "name": "wood",
+      "directions": 4
     }
   ]
 }

Resources/Textures/_CP14/Structures/Dungeon/ladders_up.rsi/meta.json

@@ -8,7 +8,15 @@
   },
   "states": [
     {
-      "name": "ladder",
+      "name": "stone",
+      "directions": 4
+    },
+    {
+      "name": "wood",
+      "directions": 4
+    },
+    {
+      "name": "marble",
       "directions": 4
     }
   ]

Resources/Textures/_CP14/Structures/Flora/snow_trees.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e00cae8d065f9cf520688cc0dd0e15ba5bef12a9, added snow by TheShuEd",
+    "size": {
+        "x": 96,
+        "y": 96
+    },
+    "states": [
+        {
+            "name": "tree01"
+        },
+        {
+            "name": "tree02"
+        },
+        {
+            "name": "tree03"
+        },
+        {
+            "name": "tree04"
+        },
+        {
+            "name": "tree05"
+        },
+        {
+            "name": "tree06"
+        }
+    ]
+}

Resources/Textures/_CP14/Structures/Flora/snowdrift.rsi/meta.json

@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "Created by TheShuEd (Github) ",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "state0",
+      "directions": 4
+    },
+    {
+      "name": "state1",
+      "directions": 4
+    },
+    {
+      "name": "state2",
+      "directions": 4
+    },
+    {
+      "name": "state3",
+      "directions": 4
+    },
+    {
+      "name": "state4",
+      "directions": 4
+    },
+    {
+      "name": "state5",
+      "directions": 4
+    },
+    {
+      "name": "state6",
+      "directions": 4
+    },
+    {
+      "name": "state7",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Tiles/Snow/attribution.yml

@@ -0,0 +1,13 @@
+- files:
+  - grass.png
+  - double_edge_E.png
+  - double_edge_N.png
+  - double_edge_S.png
+  - double_edge_W.png
+  - single_edge_NE.png
+  - single_edge_NW.png
+  - single_edge_SE.png
+  - single_edge_SW.png
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TheShuEd "
+  source: "https://github.com/crystallpunk-14/crystall-punk-14/pull/290"