Новые плитки, перекраска стен

Content.Client/Lathe/UI/LatheMenu.xaml.cs

@@ -430,6 +430,12 @@ public Control GetRecipeDisplayControl(LatheRecipePrototype recipe)
             textRect.Texture = _spriteSystem.Frame0(recipe.Icon);
             return textRect;
         }
+        else if (recipe.IconPath is { } iconPath) // CorvaxGoob
+        {
+            var textRect = new TextureRect();
+            textRect.Texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(iconPath));
+            return textRect;
+        }
 
         if (recipe.Result is { } result)
         {

Content.Client/_CorvaxGoob/SprayableWall/SprayableWallVisualizerSystem.cs

@@ -0,0 +1,39 @@
+using Content.Client.IconSmoothing;
+using Content.Shared._CorvaxGoob.SprayableWall;
+using Content.Shared.SprayPainter.Prototypes;
+using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._CorvaxGoob.SprayableWall;
+
+public sealed class SprayableWallVisualizerSystem : VisualizerSystem<SprayableWallComponent>
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IComponentFactory _componentFactory = default!;
+    [Dependency] private readonly IconSmoothSystem _iconSmooth = default!;
+
+    protected override void OnAppearanceChange(EntityUid uid,
+        SprayableWallComponent comp,
+        ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null)
+            return;
+
+        if (AppearanceSystem.TryGetData<string>(uid, PaintableVisuals.Prototype, out var prototype, args.Component))
+        {
+            if (_prototypeManager.Resolve(prototype, out var proto))
+            {
+                if (TryComp<IconSmoothComponent>(uid, out var origSmooth) && proto.TryGetComponent(out IconSmoothComponent? protoSmooth, _componentFactory))
+                {
+                    origSmooth.StateBase = protoSmooth.StateBase;
+
+                    var tempUid = Spawn(prototype);
+                    SpriteSystem.CopySprite(tempUid, uid);
+                    QueueDel(tempUid);
+
+                    _iconSmooth.DirtyNeighbours(uid);
+                }
+            }
+        }
+    }
+}

Content.Shared/Research/Prototypes/LatheRecipePrototype.cs

@@ -59,6 +59,13 @@ public sealed partial class LatheRecipePrototype : IPrototype, IInheritingProtot
         [DataField]
         public SpriteSpecifier? Icon;
 
+        // CorvaxGoob
+        /// <summary>
+        /// Альтернативный вариант поля <see cref="Icon"/> для ссылки на прямой путь до файла спрайта.
+        /// </summary>
+        [DataField]
+        public ResPath? IconPath;
+
         [DataField("completetime")]
         public TimeSpan CompleteTime = TimeSpan.FromSeconds(5);
 

Content.Shared/_CorvaxGoob/SprayableWall/SprayableWallComponent.cs

@@ -0,0 +1,4 @@
+namespace Content.Shared._CorvaxGoob.SprayableWall;
+
+[RegisterComponent]
+public sealed partial class SprayableWallComponent : Component;

Content.Shared/_CorvaxGoob/SprayableWall/SprayableWallSystem.cs

@@ -0,0 +1,27 @@
+using Content.Shared.SprayPainter;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Toolshed.TypeParsers;
+
+namespace Content.Shared._CorvaxGoob.SprayableWall;
+
+public sealed class SprayableWallSystem : EntitySystem
+{
+    [Dependency] private readonly MetaDataSystem _meta = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SprayableWallComponent, EntityPaintedEvent>(OnPainted);
+    }
+
+    private void OnPainted(Entity<SprayableWallComponent> entity, ref EntityPaintedEvent ev)
+    {
+        if (!_proto.Resolve(ev.Prototype, out var proto))
+            return;
+
+        _meta.SetEntityName(entity, proto.Name);
+        _meta.SetEntityDescription(entity, proto.Description);
+    }
+}

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

@@ -0,0 +1,2 @@
+tiles-astro-snow-dug = астро-копаный снег
+tiles-astro-chromite = астро-хромит

Resources/Locale/ru-RU/_corvaxgoob/spray-painter/spray-painter.ftl

@@ -3,4 +3,54 @@ spray-painter-style-canisters-healium = Хилиум
 spray-painter-style-canisters-bz = Би-зет
 spray-painter-style-canisters-oxygen-nitrous-oxide = Кислород с оксидом азота
 spray-painter-style-canisters-nitrium = Нитриум
-spray-painter-style-canisters-pluoxium = Плюоксий
+spray-painter-style-canisters-pluoxium = Плюоксий
+
+# Walls
+
+spray-painter-tab-category-walls = Стены
+
+spray-painter-style-walls-andesitecobblebrick = Булыжник (андесит)
+spray-painter-style-walls-andesiterock = Камень (андесит)
+spray-painter-style-walls-asteroidcobblebrick = Булыжник (астероид)
+spray-painter-style-walls-basaltrock = Камень (базальт)
+spray-painter-style-walls-basaltcobblebrick = Булыжник (базальт)
+spray-painter-style-walls-basic = Пластик
+spray-painter-style-walls-brick = Кирпич
+spray-painter-style-walls-cardboard = Картон
+spray-painter-style-walls-chromitecobblebrick = Булыжник (хромит)
+spray-painter-style-walls-clock = Часовой
+spray-painter-style-walls-clown = Банан
+spray-painter-style-walls-cobblebrick = Булыжник
+spray-painter-style-walls-diamond = Алмаз
+spray-painter-style-walls-gold = Золото
+spray-painter-style-walls-ice = Лёд
+spray-painter-style-walls-meat = Мясо
+spray-painter-style-walls-mining = Шахтёр
+spray-painter-style-walls-necropolis = Кости
+spray-painter-style-walls-plasma = Плазма
+spray-painter-style-walls-plastitanium = Пластитан
+spray-painter-style-walls-reinforced = Укреплённое
+spray-painter-style-walls-riveted = Клёп
+spray-painter-style-walls-rock = Камень
+spray-painter-style-walls-rockchromite = Камень (хромит)
+spray-painter-style-walls-rocksand = Камень (песок)
+spray-painter-style-walls-rocksnow = Камень (снег)
+spray-painter-style-walls-sandcobblebrick = Булыжник (песок)
+spray-painter-style-walls-shuttle = Шаттл
+spray-painter-style-walls-silver = Серебро
+spray-painter-style-walls-solid = Стандарт
+spray-painter-style-walls-solidrust = Стандарт (ржавое)
+spray-painter-style-walls-uranium = Уран
+spray-painter-style-walls-web = Паутина
+spray-painter-style-walls-wood = Дерево
+
+# Diagonal Walls
+
+spray-painter-tab-category-diagonalwalls = Диагональные стены
+
+spray-painter-style-diagonalwalls-solid = Стандарт
+spray-painter-style-diagonalwalls-basic = Пластик
+spray-painter-style-diagonalwalls-mining = Шахтёр
+spray-painter-style-diagonalwalls-reinforced = Укреплённое
+spray-painter-style-diagonalwalls-shuttle = Шаттл
+spray-painter-style-diagonalwalls-plastitanium = Пластитан

Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxgoob/entities/objects/misc/tiles.ftl

@@ -0,0 +1,4 @@
+ent-FloorTileItemAstroSnowDug = астро-копаный снег
+    .desc = { ent-FloorTileItemBase.desc }
+ent-FloorTileItemAstroChromite = астро-хромит
+    .desc = { ent-FloorTileItemBase.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxgoob/entities/structures/wall/wall.ftl

@@ -0,0 +1,3 @@
+ent-WallPlasticDiagonal = пластиковая стена
+    .desc = { ent-WallShuttleDiagonal.desc }
+    .suffix = Диагональ

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -880,6 +880,8 @@
     - FloorConcreteTilesStatic
     - CircuitFloorsStatic
     - FloorMarbleTilesStatic
+    - FloorOther # CorvaxGoob
+    - FloorShuttle # CorvaxGoob
     dynamicPacks:
     - FauxTiles
   - type: MaterialStorage

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

@@ -527,6 +527,10 @@
   - type: IconSmooth
     key: walls
     base: plastic
+  - type: Appearance # CorvaxGoob
+  - type: Paintable # CorvaxGoob
+    group: Walls
+  - type: SprayableWall # CorvaxGoob
   - type: CosmicCorruptible # DeltaV - Cosmic Cult
     convertTo: WallCosmicCult
 

Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml

@@ -56,6 +56,26 @@
   - FloorTileItemWood
   - FloorTileItemWoodLarge
   - FloorTileItemWoodPattern
+  # CorvaxGoob-Start
+  - FloorTileItemWoodLargeRed
+  - FloorTileItemWoodLargeLight
+  - FloorTileItemWoodLargeDark
+  - FloorTileItemWoodLargeBlack
+  - FloorTileItemWoodRed
+  - FloorTileItemWoodLight
+  - FloorTileItemWoodDark
+  - FloorTileItemWoodBlack
+  - FloorTileItemWoodParquet
+  - FloorTileItemWoodParquetRed
+  - FloorTileItemWoodParquetLight
+  - FloorTileItemWoodParquetDark
+  - FloorTileItemWoodParquetBlack
+  - FloorTileItemWoodChess
+  - FloorTileItemWoodChessRed
+  - FloorTileItemWoodChessLight
+  - FloorTileItemWoodChessDark
+  - FloorTileItemWoodChessBlack
+  # CorvaxGoob-End
 
 - type: latheRecipePack
   id: FloorConcreteTilesStatic
@@ -85,6 +105,7 @@
   recipes:
   - FloorTileItemWhiteMarble
   - FloorTileItemDarkMarble
+  - FloorTileItemUraniumMarble # CorvaxGoob
 
 ## Dynamic
 
@@ -102,3 +123,5 @@
   - FauxTileDesertAstroSand
   - FauxTileAstroIronsand
   - FauxTileAstroIronsandBorderless
+  - FauxTileAstroSnowDug # CorvaxGoob
+  - FauxTileItemAstroChromite # CorvaxGoob