From 551c38b2f6eb0e0f14a8e04d1f9210a36a5d242d Mon Sep 17 00:00:00 2001 From: KillanGenifer Date: Sun, 30 Aug 2026 17:44:33 +0700 Subject: [PATCH 1/3] init --- .../IconSmoothVisualizerSystem.cs | 41 +++++++++++++++++ .../Entities/Structures/Walls/walls.yml | 3 ++ .../Prototypes/Paintables/categories.yml | 46 +++++++++++++++++++ .../_CorvaxGoob/Recipes/Lathes/tiles.yml | 0 4 files changed, 90 insertions(+) create mode 100644 Content.Client/_CorvaxGoob/IconSmoothing/IconSmoothVisualizerSystem.cs create mode 100644 Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/tiles.yml diff --git a/Content.Client/_CorvaxGoob/IconSmoothing/IconSmoothVisualizerSystem.cs b/Content.Client/_CorvaxGoob/IconSmoothing/IconSmoothVisualizerSystem.cs new file mode 100644 index 000000000000..10ca667bc558 --- /dev/null +++ b/Content.Client/_CorvaxGoob/IconSmoothing/IconSmoothVisualizerSystem.cs @@ -0,0 +1,41 @@ +using Content.Client.IconSmoothing; +using Content.Client.Storage.Visualizers; +using Content.Shared.SprayPainter.Prototypes; +using Content.Shared.Storage; +using Robust.Client.GameObjects; +using Robust.Shared.Prototypes; +using System.Linq; + +namespace Content.Client._CorvaxGoob.IconSmoothing; + +public sealed class IconSmoothVisualizerSystem : VisualizerSystem +{ + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IComponentFactory _componentFactory = default!; + [Dependency] private readonly IconSmoothSystem _iconSmooth = default!; + + protected override void OnAppearanceChange(EntityUid uid, + IconSmoothComponent comp, + ref AppearanceChangeEvent args) + { + if (args.Sprite == null) + return; + + if (AppearanceSystem.TryGetData(uid, PaintableVisuals.Prototype, out var prototype, args.Component)) + { + if (_prototypeManager.Resolve(prototype, out var proto)) + { + if (proto.TryGetComponent(out SpriteComponent? sprite, _componentFactory) && proto.TryGetComponent(out IconSmoothComponent? smooth, _componentFactory)) + { + comp.StateBase = smooth.StateBase; + + var tempUid = Spawn(prototype); + SpriteSystem.CopySprite(tempUid, uid); + QueueDel(tempUid); + + _iconSmooth.DirtyNeighbours(uid); + } + } + } + } +} diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 97d8d08aeacf..63b011f04858 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -527,6 +527,9 @@ - type: IconSmooth key: walls base: plastic + - type: Appearance + - type: Paintable + group: Walls - type: CosmicCorruptible # DeltaV - Cosmic Cult convertTo: WallCosmicCult diff --git a/Resources/Prototypes/Paintables/categories.yml b/Resources/Prototypes/Paintables/categories.yml index 75998c31ba6d..f6eb140ee17e 100644 --- a/Resources/Prototypes/Paintables/categories.yml +++ b/Resources/Prototypes/Paintables/categories.yml @@ -23,3 +23,49 @@ - Closet - WallLocker - WallCloset + +- type: paintableGroupCategory + id: Walls + groups: + - Walls + +- type: paintableGroup + id: Walls + time: 3 + cost: 3 + defaultStyle: basic + styles: + solid: WallSolid + basaltcobblebrick: WallBasaltCobblebrick + clown: WallClown + balaltrock: WallRockBasalt + basic: WallPlastic + asteroidcobblebrick: WallAsteroidCobblebrick + andesitecobblebrick: WallAndesiteCobblebrick + andesiterock: WallRockAndesite + diamond: WallDiamond + cobblebrick: WallCobblebrick + wood: WallWood + clock: WallClock + necropolis: WallNecropolis + gold: WallGold + rock: WallRockQuartz + cardboard: Cardwall + brick: WallBrick + riveted: WallRiveted + ice: WallIce + meat: WallMeat + solidrust: WallSolidRust + web: WallWeb + rocksand: WallRockSand + sandcobblebrick: WallSandCobblebrick + mining: WallMining + chromitecobblebrick: WallChromiteCobblebrick + rockchromite: WallRockChromite + uranium: WallUranium + reinforced: WallReinforced + rocksnow: WallRockSnow + shuttle: WallShuttle + silver: WallSilver + plastitanium: WallPlastitanium + plasma: WallPlasma diff --git a/Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/tiles.yml b/Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/tiles.yml new file mode 100644 index 000000000000..e69de29bb2d1 From f18f86a48767be21616d9d9b49726d2b32324e5d Mon Sep 17 00:00:00 2001 From: KillanGenifer Date: Mon, 31 Aug 2026 23:24:34 +0700 Subject: [PATCH 2/3] part 2 --- Content.Client/Lathe/UI/LatheMenu.xaml.cs | 8 +- .../SprayableWallVisualizerSystem.cs} | 14 +- .../Prototypes/LatheRecipePrototype.cs | 7 + .../SprayableWall/SprayableWallComponent.cs | 4 + .../SprayableWall/SprayableWallSystem.cs | 27 ++ .../Locale/ru-RU/_CorvaxGoob/tiles/tiles.ftl | 2 + .../spray-painter/spray-painter.ftl | 52 +++- .../entities/objects/misc/tiles.ftl | 4 + .../entities/structures/wall/wall.ftl | 3 + .../Entities/Structures/Machines/lathe.yml | 2 + .../Entities/Structures/Walls/walls.yml | 3 +- .../Prototypes/Paintables/categories.yml | 46 ---- .../Prototypes/Recipes/Lathes/Packs/tiles.yml | 23 ++ Resources/Prototypes/Recipes/Lathes/tiles.yml | 66 +++++ .../Prototypes/Research/civilianservices.yml | 2 + .../Entities/Objects/Misc/tiles.yml | 35 +++ .../Entities/Structures/Walls/walls.yml | 39 +++ .../_CorvaxGoob/Paintables/categories.yml | 9 + .../_CorvaxGoob/Paintables/diagonal_walls.yml | 12 + .../_CorvaxGoob/Paintables/walls.yml | 40 +++ .../Recipes/Lathes/Packs/tiles.yml | 23 ++ .../_CorvaxGoob/Recipes/Lathes/tiles.yml | 249 ++++++++++++++++++ .../_CorvaxGoob/Stacks/Tiles/faux.yml | 11 + .../Prototypes/_CorvaxGoob/Tiles/floors.yml | 35 +++ .../Objects/Tiles/tile.rsi/chromite.png | Bin 0 -> 422 bytes .../Objects/Tiles/tile.rsi/meta.json | 17 ++ .../Objects/Tiles/tile.rsi/snow-dug.png | Bin 0 -> 867 bytes .../Walls/plastic_diagonal.rsi/meta.json | 17 ++ .../Walls/plastic_diagonal.rsi/state0.png | Bin 0 -> 513 bytes .../Walls/plastic_diagonal.rsi/state1.png | Bin 0 -> 475 bytes 30 files changed, 693 insertions(+), 57 deletions(-) rename Content.Client/_CorvaxGoob/{IconSmoothing/IconSmoothVisualizerSystem.cs => SprayableWall/SprayableWallVisualizerSystem.cs} (68%) create mode 100644 Content.Shared/_CorvaxGoob/SprayableWall/SprayableWallComponent.cs create mode 100644 Content.Shared/_CorvaxGoob/SprayableWall/SprayableWallSystem.cs create mode 100644 Resources/Locale/ru-RU/_CorvaxGoob/tiles/tiles.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxgoob/entities/objects/misc/tiles.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxgoob/entities/structures/wall/wall.ftl create mode 100644 Resources/Prototypes/_CorvaxGoob/Entities/Objects/Misc/tiles.yml create mode 100644 Resources/Prototypes/_CorvaxGoob/Entities/Structures/Walls/walls.yml create mode 100644 Resources/Prototypes/_CorvaxGoob/Paintables/categories.yml create mode 100644 Resources/Prototypes/_CorvaxGoob/Paintables/diagonal_walls.yml create mode 100644 Resources/Prototypes/_CorvaxGoob/Paintables/walls.yml create mode 100644 Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/Packs/tiles.yml create mode 100644 Resources/Prototypes/_CorvaxGoob/Stacks/Tiles/faux.yml create mode 100644 Resources/Prototypes/_CorvaxGoob/Tiles/floors.yml create mode 100644 Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/chromite.png create mode 100644 Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/snow-dug.png create mode 100644 Resources/Textures/_CorvaxGoob/Structures/Walls/plastic_diagonal.rsi/meta.json create mode 100644 Resources/Textures/_CorvaxGoob/Structures/Walls/plastic_diagonal.rsi/state0.png create mode 100644 Resources/Textures/_CorvaxGoob/Structures/Walls/plastic_diagonal.rsi/state1.png diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs index 48571da139e4..e6369dce938e 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs @@ -430,8 +430,14 @@ public Control GetRecipeDisplayControl(LatheRecipePrototype recipe) textRect.Texture = _spriteSystem.Frame0(recipe.Icon); return textRect; } + else if (recipe.IconPath is { } iconPath) + { + var textRect = new TextureRect(); + textRect.Texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(iconPath)); + return textRect; + } - if (recipe.Result is { } result) + if (recipe.Result is { } result) // CorvaxGoob { var entProtoView = new EntityPrototypeView(); entProtoView.SetPrototype(result); diff --git a/Content.Client/_CorvaxGoob/IconSmoothing/IconSmoothVisualizerSystem.cs b/Content.Client/_CorvaxGoob/SprayableWall/SprayableWallVisualizerSystem.cs similarity index 68% rename from Content.Client/_CorvaxGoob/IconSmoothing/IconSmoothVisualizerSystem.cs rename to Content.Client/_CorvaxGoob/SprayableWall/SprayableWallVisualizerSystem.cs index 10ca667bc558..dec5d67a2e31 100644 --- a/Content.Client/_CorvaxGoob/IconSmoothing/IconSmoothVisualizerSystem.cs +++ b/Content.Client/_CorvaxGoob/SprayableWall/SprayableWallVisualizerSystem.cs @@ -1,21 +1,19 @@ using Content.Client.IconSmoothing; -using Content.Client.Storage.Visualizers; +using Content.Shared._CorvaxGoob.SprayableWall; using Content.Shared.SprayPainter.Prototypes; -using Content.Shared.Storage; using Robust.Client.GameObjects; using Robust.Shared.Prototypes; -using System.Linq; -namespace Content.Client._CorvaxGoob.IconSmoothing; +namespace Content.Client._CorvaxGoob.SprayableWall; -public sealed class IconSmoothVisualizerSystem : VisualizerSystem +public sealed class SprayableWallVisualizerSystem : VisualizerSystem { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IComponentFactory _componentFactory = default!; [Dependency] private readonly IconSmoothSystem _iconSmooth = default!; protected override void OnAppearanceChange(EntityUid uid, - IconSmoothComponent comp, + SprayableWallComponent comp, ref AppearanceChangeEvent args) { if (args.Sprite == null) @@ -25,9 +23,9 @@ protected override void OnAppearanceChange(EntityUid uid, { if (_prototypeManager.Resolve(prototype, out var proto)) { - if (proto.TryGetComponent(out SpriteComponent? sprite, _componentFactory) && proto.TryGetComponent(out IconSmoothComponent? smooth, _componentFactory)) + if (TryComp(uid, out var origSmooth) && proto.TryGetComponent(out IconSmoothComponent? protoSmooth, _componentFactory)) { - comp.StateBase = smooth.StateBase; + origSmooth.StateBase = protoSmooth.StateBase; var tempUid = Spawn(prototype); SpriteSystem.CopySprite(tempUid, uid); diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs index 953ac5b7d563..a5662d973a9b 100644 --- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs +++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs @@ -59,6 +59,13 @@ public sealed partial class LatheRecipePrototype : IPrototype, IInheritingProtot [DataField] public SpriteSpecifier? Icon; + // CorvaxGoob + /// + /// Альтернативный вариант поля для ссылки на прямой путь до файла спрайта. + /// + [DataField] + public ResPath? IconPath; + [DataField("completetime")] public TimeSpan CompleteTime = TimeSpan.FromSeconds(5); diff --git a/Content.Shared/_CorvaxGoob/SprayableWall/SprayableWallComponent.cs b/Content.Shared/_CorvaxGoob/SprayableWall/SprayableWallComponent.cs new file mode 100644 index 000000000000..2195b28a760a --- /dev/null +++ b/Content.Shared/_CorvaxGoob/SprayableWall/SprayableWallComponent.cs @@ -0,0 +1,4 @@ +namespace Content.Shared._CorvaxGoob.SprayableWall; + +[RegisterComponent] +public sealed partial class SprayableWallComponent : Component; diff --git a/Content.Shared/_CorvaxGoob/SprayableWall/SprayableWallSystem.cs b/Content.Shared/_CorvaxGoob/SprayableWall/SprayableWallSystem.cs new file mode 100644 index 000000000000..ab8bc189201f --- /dev/null +++ b/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(OnPainted); + } + + private void OnPainted(Entity entity, ref EntityPaintedEvent ev) + { + if (!_proto.Resolve(ev.Prototype, out var proto)) + return; + + _meta.SetEntityName(entity, proto.Name); + _meta.SetEntityDescription(entity, proto.Description); + } +} diff --git a/Resources/Locale/ru-RU/_CorvaxGoob/tiles/tiles.ftl b/Resources/Locale/ru-RU/_CorvaxGoob/tiles/tiles.ftl new file mode 100644 index 000000000000..c9f533a51e0d --- /dev/null +++ b/Resources/Locale/ru-RU/_CorvaxGoob/tiles/tiles.ftl @@ -0,0 +1,2 @@ +tiles-astro-snow-dug = астро-копаный снег +tiles-astro-chromite = астро-хромит diff --git a/Resources/Locale/ru-RU/_corvaxgoob/spray-painter/spray-painter.ftl b/Resources/Locale/ru-RU/_corvaxgoob/spray-painter/spray-painter.ftl index 51ad07beda88..4d18e6f49c10 100644 --- a/Resources/Locale/ru-RU/_corvaxgoob/spray-painter/spray-painter.ftl +++ b/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 = Плюоксий \ No newline at end of file +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 = Пластитан diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxgoob/entities/objects/misc/tiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxgoob/entities/objects/misc/tiles.ftl new file mode 100644 index 000000000000..12656f438fe9 --- /dev/null +++ b/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 } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxgoob/entities/structures/wall/wall.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxgoob/entities/structures/wall/wall.ftl new file mode 100644 index 000000000000..34779a278c8a --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxgoob/entities/structures/wall/wall.ftl @@ -0,0 +1,3 @@ +ent-WallPlasticDiagonal = пластиковая стена + .desc = { ent-WallShuttleDiagonal.desc } + .suffix = Диагональ diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index f5bbab5d1472..96e759b25b82 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -880,6 +880,8 @@ - FloorConcreteTilesStatic - CircuitFloorsStatic - FloorMarbleTilesStatic + - FloorOther # CorvaxGoob + - FloorShuttle # CorvaxGoob dynamicPacks: - FauxTiles - type: MaterialStorage diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 63b011f04858..9f1e2e9cff1a 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -528,8 +528,9 @@ key: walls base: plastic - type: Appearance - - type: Paintable + - type: Paintable # CorvaxGoob group: Walls + - type: SprayableWall # CorvaxGoob - type: CosmicCorruptible # DeltaV - Cosmic Cult convertTo: WallCosmicCult diff --git a/Resources/Prototypes/Paintables/categories.yml b/Resources/Prototypes/Paintables/categories.yml index f6eb140ee17e..75998c31ba6d 100644 --- a/Resources/Prototypes/Paintables/categories.yml +++ b/Resources/Prototypes/Paintables/categories.yml @@ -23,49 +23,3 @@ - Closet - WallLocker - WallCloset - -- type: paintableGroupCategory - id: Walls - groups: - - Walls - -- type: paintableGroup - id: Walls - time: 3 - cost: 3 - defaultStyle: basic - styles: - solid: WallSolid - basaltcobblebrick: WallBasaltCobblebrick - clown: WallClown - balaltrock: WallRockBasalt - basic: WallPlastic - asteroidcobblebrick: WallAsteroidCobblebrick - andesitecobblebrick: WallAndesiteCobblebrick - andesiterock: WallRockAndesite - diamond: WallDiamond - cobblebrick: WallCobblebrick - wood: WallWood - clock: WallClock - necropolis: WallNecropolis - gold: WallGold - rock: WallRockQuartz - cardboard: Cardwall - brick: WallBrick - riveted: WallRiveted - ice: WallIce - meat: WallMeat - solidrust: WallSolidRust - web: WallWeb - rocksand: WallRockSand - sandcobblebrick: WallSandCobblebrick - mining: WallMining - chromitecobblebrick: WallChromiteCobblebrick - rockchromite: WallRockChromite - uranium: WallUranium - reinforced: WallReinforced - rocksnow: WallRockSnow - shuttle: WallShuttle - silver: WallSilver - plastitanium: WallPlastitanium - plasma: WallPlasma diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml index 2dd04965741f..3709713e6ae4 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml index 262d768c4a46..37966e9e6e03 100644 --- a/Resources/Prototypes/Recipes/Lathes/tiles.yml +++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml @@ -101,217 +101,259 @@ parent: BaseSteelTileRecipe id: FloorTileItemSteelCheckerDark result: FloorTileItemSteelCheckerDark + iconPath: /Textures/Tiles/checker_dark.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteelCheckerLight result: FloorTileItemSteelCheckerLight + iconPath: /Textures/Tiles/cafeteria.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteel result: FloorTileItemSteel + iconPath: /Textures/Tiles/steel.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteelOffset result: FloorTileItemSteelOffset + iconPath: /Textures/Tiles/steel_offset.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteelDiagonalMini result: FloorTileItemSteelDiagonalMini + iconPath: /Textures/Tiles/steel_diagonal_mini.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteelDiagonal result: FloorTileItemSteelDiagonal + iconPath: /Textures/Tiles/steel_diagonal.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteelHerringbone result: FloorTileItemSteelHerringbone + iconPath: /Textures/Tiles/steel_herringbone.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteelMini result: FloorTileItemSteelMini + iconPath: /Textures/Tiles/steel_mini.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteelMono result: FloorTileItemSteelMono + iconPath: /Textures/Tiles/steel_mono.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteelPavement result: FloorTileItemSteelPavement + iconPath: /Textures/Tiles/steel_pavement.png # CorvaxGoob - type: latheRecipe parent: BaseSteelTileRecipe id: FloorTileItemSteelPavementVertical result: FloorTileItemSteelPavementVertical + iconPath: /Textures/Tiles/steel_pavement_vertical.png # CorvaxGoob # Dark tiles - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDark result: FloorTileItemDark + iconPath: /Textures/Tiles/dark.png # CorvaxGoob - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDarkDiagonalMini result: FloorTileItemDarkDiagonalMini + iconPath: /Textures/Tiles/dark_diagonal_mini.png # CorvaxGoob - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDarkDiagonal result: FloorTileItemDarkDiagonal + iconPath: /Textures/Tiles/dark_diagonal.png # CorvaxGoob - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDarkHerringbone result: FloorTileItemDarkHerringbone + iconPath: /Textures/Tiles/dark_herringbone.png # CorvaxGoob - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDarkMini result: FloorTileItemDarkMini + iconPath: /Textures/Tiles/dark_mini.png # CorvaxGoob - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDarkMono result: FloorTileItemDarkMono + iconPath: /Textures/Tiles/dark_mono.png # CorvaxGoob - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDarkPavement result: FloorTileItemDarkPavement + iconPath: /Textures/Tiles/dark_pavement.png # CorvaxGoob - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDarkPavementVertical result: FloorTileItemDarkPavementVertical + iconPath: /Textures/Tiles/dark_pavement_vertical.png # CorvaxGoob - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDarkOffset result: FloorTileItemDarkOffset + iconPath: /Textures/Tiles/dark_offset.png # CorvaxGoob - type: latheRecipe parent: BaseDarkTileRecipe id: FloorTileItemDarkSquiggly result: FloorTileItemDarkSquiggly + iconPath: /Textures/Tiles/dark_squiggly.png # CorvaxGoob # White steel tiles - type: latheRecipe parent: BaseWhiteTileRecipe id: FloorTileItemWhite result: FloorTileItemWhite + iconPath: /Textures/Tiles/white.png # CorvaxGoob - type: latheRecipe parent: BaseWhiteTileRecipe id: FloorTileItemWhiteOffset result: FloorTileItemWhiteOffset + iconPath: /Textures/Tiles/white_offset.png # CorvaxGoob - type: latheRecipe parent: BaseWhiteTileRecipe id: FloorTileItemWhiteDiagonalMini result: FloorTileItemWhiteDiagonalMini + iconPath: /Textures/Tiles/white_diagonal_mini.png # CorvaxGoob - type: latheRecipe parent: BaseWhiteTileRecipe id: FloorTileItemWhiteDiagonal result: FloorTileItemWhiteDiagonal + iconPath: /Textures/Tiles/white_diagonal.png # CorvaxGoob - type: latheRecipe parent: BaseWhiteTileRecipe id: FloorTileItemWhiteHerringbone result: FloorTileItemWhiteHerringbone + iconPath: /Textures/Tiles/white_herringbone.png # CorvaxGoob - type: latheRecipe parent: BaseWhiteTileRecipe id: FloorTileItemWhiteMini result: FloorTileItemWhiteMini + iconPath: /Textures/Tiles/white_mini.png # CorvaxGoob - type: latheRecipe parent: BaseWhiteTileRecipe id: FloorTileItemWhiteMono result: FloorTileItemWhiteMono + iconPath: /Textures/Tiles/white_mono.png # CorvaxGoob - type: latheRecipe parent: BaseWhiteTileRecipe id: FloorTileItemWhitePavement result: FloorTileItemWhitePavement + iconPath: /Textures/Tiles/white_pavement.png # CorvaxGoob - type: latheRecipe parent: BaseWhiteTileRecipe id: FloorTileItemWhitePavementVertical result: FloorTileItemWhitePavementVertical + iconPath: /Textures/Tiles/white_pavement_vertical.png # CorvaxGoob # Maints - type: latheRecipe parent: BaseMaintTileRecipe id: FloorTileItemGratingMaint result: FloorTileItemGratingMaint + iconPath: /Textures/Tiles/grating_maint.png # CorvaxGoob - type: latheRecipe parent: BaseMaintTileRecipe id: FloorTileItemTechmaint result: FloorTileItemTechmaint + iconPath: /Textures/Tiles/tech_maint.png # CorvaxGoob - type: latheRecipe parent: BaseMaintTileRecipe id: FloorTileItemTechmaintDark result: FloorTileItemTechmaintDark + iconPath: /Textures/Tiles/tech_maint_dark.png # CorvaxGoob - type: latheRecipe parent: BaseMaintTileRecipe id: FloorTileItemSteelMaint result: FloorTileItemSteelMaint + iconPath: /Textures/Tiles/steel_maint.png # CorvaxGoob # Circuit - type: latheRecipe parent: BaseCircuitTileRecipe id: FloorGreenCircuit result: FloorTileItemGCircuit + iconPath: /Textures/Tiles/green_circuit.png # CorvaxGoob - type: latheRecipe parent: BaseCircuitTileRecipe id: FloorBlueCircuit result: FloorTileItemBCircuit + iconPath: /Textures/Tiles/blue_circuit.png # CorvaxGoob - type: latheRecipe parent: BaseCircuitTileRecipe id: FloorRedCircuit result: FloorTileItemRCircuit + iconPath: /Textures/Tiles/red_circuit.png # CorvaxGoob # Wood - type: latheRecipe parent: BaseWoodTileRecipe id: FloorTileItemWood result: FloorTileItemWood + iconPath: /Textures/Tiles/wood.png # CorvaxGoob - type: latheRecipe parent: BaseWoodTileRecipe id: FloorTileItemWoodLarge result: FloorTileItemWoodLarge + iconPath: /Textures/Tiles/wood_large.png # CorvaxGoob - type: latheRecipe parent: BaseWoodTileRecipe id: FloorTileItemWoodPattern result: FloorTileItemWoodPattern + iconPath: /Textures/Tiles/wood_tile.png # CorvaxGoob # Concrete - type: latheRecipe parent: BaseConcreteTileRecipe id: FloorTileItemConcrete result: FloorTileItemConcrete + iconPath: /Textures/Tiles/Planet/Concrete/concrete.png # CorvaxGoob - type: latheRecipe parent: BaseConcreteTileRecipe id: FloorTileItemConcreteMono result: FloorTileItemConcreteMono + iconPath: /Textures/Tiles/Planet/Concrete/concrete_mono.png # CorvaxGoob applyMaterialDiscount: false completetime: 0.5 materials: @@ -321,6 +363,7 @@ - type: latheRecipe id: FloorTileItemConcreteSmooth result: FloorTileItemConcreteSmooth + iconPath: /Textures/Tiles/Planet/Concrete/concrete_smooth.png # CorvaxGoob applyMaterialDiscount: false completetime: 0.5 materials: @@ -330,6 +373,7 @@ - type: latheRecipe id: FloorTileItemGrayConcrete result: FloorTileItemGrayConcrete + iconPath: /Textures/Tiles/Planet/Concrete/grayconcrete.png # CorvaxGoob applyMaterialDiscount: false completetime: 0.5 materials: @@ -339,6 +383,7 @@ - type: latheRecipe id: FloorTileItemGrayConcreteMono result: FloorTileItemGrayConcreteMono + iconPath: /Textures/Tiles/Planet/Concrete/grayconcrete_mono.png # CorvaxGoob applyMaterialDiscount: false completetime: 0.5 materials: @@ -348,6 +393,7 @@ - type: latheRecipe id: FloorTileItemGrayConcreteSmooth result: FloorTileItemGrayConcreteSmooth + iconPath: /Textures/Tiles/Planet/Concrete/grayconcrete_smooth.png # CorvaxGoob applyMaterialDiscount: false completetime: 0.5 materials: @@ -357,6 +403,7 @@ - type: latheRecipe id: FloorTileItemOldConcrete result: FloorTileItemOldConcrete + iconPath: /Textures/Tiles/Planet/Concrete/oldconcrete.png # CorvaxGoob applyMaterialDiscount: false completetime: 0.5 materials: @@ -366,6 +413,7 @@ - type: latheRecipe id: FloorTileItemOldConcreteMono result: FloorTileItemOldConcreteMono + iconPath: /Textures/Tiles/Planet/Concrete/oldconcrete_mono.png # CorvaxGoob applyMaterialDiscount: false completetime: 0.5 materials: @@ -375,6 +423,7 @@ - type: latheRecipe id: FloorTileItemOldConcreteSmooth result: FloorTileItemOldConcreteSmooth + iconPath: /Textures/Tiles/Planet/Concrete/oldconcrete_smooth.png # CorvaxGoob applyMaterialDiscount: false completetime: 0.5 materials: @@ -385,85 +434,102 @@ parent: BaseConcreteTileRecipe id: FloorTileItemIronsandConcrete result: FloorTileItemIronsandConcrete + iconPath: /Textures/Tiles/Planet/Concrete/ironsandconcrete.png # CorvaxGoob - type: latheRecipe parent: BaseConcreteTileRecipe id: FloorTileItemIronsandConcreteMono result: FloorTileItemIronsandConcreteMono + iconPath: /Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png # CorvaxGoob - type: latheRecipe parent: BaseConcreteTileRecipe id: FloorTileItemIronsandConcreteSmooth result: FloorTileItemIronsandConcreteSmooth + iconPath: /Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png # CorvaxGoob # Faux - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileAstroGrass result: FloorTileItemAstroGrass + iconPath: /Textures/Tiles/Planet/Grass/grass.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileMowedAstroGrass result: FloorTileItemMowedAstroGrass + iconPath: /Textures/Tiles/grass.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileJungleAstroGrass result: FloorTileItemJungleAstroGrass + iconPath: /Textures/Tiles/grassjungle.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileDarkAstroGrass result: FloorTileItemDarkAstroGrass + iconPath: /Textures/Tiles/grassdark.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileLightAstroGrass result: FloorTileItemLightAstroGrass + iconPath: /Textures/Tiles/grasslight.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileAstroIce result: FloorTileItemAstroIce + iconPath: /Textures/Tiles/Planet/Snow/ice.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileAstroSnow result: FloorTileItemAstroSnow + iconPath: /Textures/Tiles/Planet/Snow/snow.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileAstroAsteroidSand result: FloorTileItemAstroAsteroidSand + iconPath: /Textures/Tiles/Asteroid/asteroid.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileAstroAsteroidSandBorderless result: FloorTileItemAstroAsteroidSandBorderless + iconPath: /Textures/Tiles/Asteroid/asteroid.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileDesertAstroSand result: FloorTileItemDesertAstroSand + iconPath: /Textures/Tiles/Planet/Desert/desert.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileAstroIronsand result: FloorTileItemAstroIronsand + iconPath: /Textures/Tiles/Asteroid/ironsand.png # CorvaxGoob - type: latheRecipe parent: BaseFauxTileRecipe id: FauxTileAstroIronsandBorderless result: FloorTileItemAstroIronsandBorderless + iconPath: /Textures/Tiles/Asteroid/ironsand.png # CorvaxGoob # Marble - type: latheRecipe parent: BaseMarbleTileRecipe id: FloorTileItemWhiteMarble result: FloorTileItemWhiteMarble + iconPath: /Textures/Tiles/white_marble.png # CorvaxGoob - type: latheRecipe parent: BaseMarbleTileRecipe id: FloorTileItemDarkMarble result: FloorTileItemDarkMarble + iconPath: /Textures/Tiles/dark_marble.png # CorvaxGoob diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 1b4e2005122f..a60dd58aab7b 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -132,6 +132,8 @@ - FauxTileDesertAstroSand - FauxTileAstroIronsand - FauxTileAstroIronsandBorderless + - FauxTileAstroSnowDug + - FauxTileItemAstroChromite # Goobstation R&D Console rework start position: 1,5 technologyPrerequisites: diff --git a/Resources/Prototypes/_CorvaxGoob/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/_CorvaxGoob/Entities/Objects/Misc/tiles.yml new file mode 100644 index 000000000000..790f584ce7c0 --- /dev/null +++ b/Resources/Prototypes/_CorvaxGoob/Entities/Objects/Misc/tiles.yml @@ -0,0 +1,35 @@ +- type: entity + parent: FloorTileItemBase + id: FloorTileItemAstroChromite + name: astro-chromite + components: + - type: Sprite + sprite: _CorvaxGoob/Objects/Tiles/tile.rsi + state: chromite + - type: Item + sprite: _CorvaxGoob/Objects/Tiles/tile.rsi + heldPrefix: chromite + - type: FloorTile + outputs: + - Plating + - FauxAstroChromite + - type: Stack + stackType: FauxTileAstroChromite + +- type: entity + parent: FloorTileItemBase + id: FloorTileItemAstroSnowDug + name: astro-snow dug + components: + - type: Sprite + sprite: _CorvaxGoob/Objects/Tiles/tile.rsi + state: snow-dug + - type: Item + sprite: _CorvaxGoob/Objects/Tiles/tile.rsi + heldPrefix: snow-dug + - type: FloorTile + outputs: + - Plating + - FauxAstroSnowDug + - type: Stack + stackType: FauxTileAstroSnowDug diff --git a/Resources/Prototypes/_CorvaxGoob/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CorvaxGoob/Entities/Structures/Walls/walls.yml new file mode 100644 index 000000000000..dda8fd96850a --- /dev/null +++ b/Resources/Prototypes/_CorvaxGoob/Entities/Structures/Walls/walls.yml @@ -0,0 +1,39 @@ +- type: entity + parent: WallDiagonalBase + id: WallPlasticDiagonal + name: plastic wall + suffix: diagonal + components: + - type: Sprite + drawdepth: Walls + sprite: _CorvaxGoob/Structures/Walls/plastic_diagonal.rsi + state: state0 + - type: Icon + sprite: _CorvaxGoob/Structures/Walls/plastic_diagonal.rsi + state: state0 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalSlam + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalSlam + - !type:ChangeConstructionNodeBehavior + node: girder + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Paintable + group: DiagonalWalls + - type: SprayableWall + - type: Appearance diff --git a/Resources/Prototypes/_CorvaxGoob/Paintables/categories.yml b/Resources/Prototypes/_CorvaxGoob/Paintables/categories.yml new file mode 100644 index 000000000000..01ecc933786d --- /dev/null +++ b/Resources/Prototypes/_CorvaxGoob/Paintables/categories.yml @@ -0,0 +1,9 @@ +- type: paintableGroupCategory + id: Walls + groups: + - Walls + +- type: paintableGroupCategory + id: DiagonalWalls + groups: + - DiagonalWalls diff --git a/Resources/Prototypes/_CorvaxGoob/Paintables/diagonal_walls.yml b/Resources/Prototypes/_CorvaxGoob/Paintables/diagonal_walls.yml new file mode 100644 index 000000000000..13f926ead6a4 --- /dev/null +++ b/Resources/Prototypes/_CorvaxGoob/Paintables/diagonal_walls.yml @@ -0,0 +1,12 @@ +- type: paintableGroup + id: DiagonalWalls + time: 3 + cost: 3 + defaultStyle: basic + styles: + solid: WallSolidDiagonal + basic: WallPlasticDiagonal + mining: WallMiningDiagonal + reinforced: WallReinforcedDiagonal + shuttle: WallShuttleDiagonal + plastitanium: WallPlastitaniumDiagonal diff --git a/Resources/Prototypes/_CorvaxGoob/Paintables/walls.yml b/Resources/Prototypes/_CorvaxGoob/Paintables/walls.yml new file mode 100644 index 000000000000..6e901699b7d7 --- /dev/null +++ b/Resources/Prototypes/_CorvaxGoob/Paintables/walls.yml @@ -0,0 +1,40 @@ +- type: paintableGroup + id: Walls + time: 3 + cost: 3 + defaultStyle: basic + styles: + solid: WallSolid + basaltcobblebrick: WallBasaltCobblebrick + clown: WallClown + basaltrock: WallRockBasalt + basic: WallPlastic + asteroidcobblebrick: WallAsteroidCobblebrick + andesitecobblebrick: WallAndesiteCobblebrick + andesiterock: WallRockAndesite + diamond: WallDiamond + cobblebrick: WallCobblebrick + wood: WallWood + clock: WallClock + necropolis: WallNecropolis + gold: WallGold + rock: WallRockQuartz + cardboard: Cardwall + brick: WallBrick + riveted: WallRiveted + ice: WallIce + meat: WallMeat + solidrust: WallSolidRust + web: WallWeb + rocksand: WallRockSand + sandcobblebrick: WallSandCobblebrick + mining: WallMining + chromitecobblebrick: WallChromiteCobblebrick + rockchromite: WallRockChromite + uranium: WallUranium + reinforced: WallReinforced + rocksnow: WallRockSnow + shuttle: WallShuttle + silver: WallSilver + plastitanium: WallPlastitanium + plasma: WallPlasma diff --git a/Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/Packs/tiles.yml b/Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/Packs/tiles.yml new file mode 100644 index 000000000000..c53d9c03b8f0 --- /dev/null +++ b/Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/Packs/tiles.yml @@ -0,0 +1,23 @@ +- type: latheRecipePack + id: FloorOther + recipes: + - FloorTileItemGold + - FloorTileItemSilver + - FloorTileItemRockVault + - FloorTileItemLino + - FloorTileItemArcadeBlue + - FloorTileItemArcadeBlue2 + - FloorTileItemArcadeRed + - FloorTileItemCarpetClown + - FloorTileItemCarpetOffice + +- type: latheRecipePack + id: FloorShuttle + recipes: + - FloorTileItemShuttleWhite + - FloorTileItemShuttleRed + - FloorTileItemShuttleOrange + - FloorTileItemShuttleBlue + - FloorTileItemShuttleGrey + - FloorTileItemShuttleBlack + - FloorTileItemShuttlePurple diff --git a/Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/tiles.yml b/Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/tiles.yml index e69de29bb2d1..e898fdc2bdbc 100644 --- a/Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/tiles.yml +++ b/Resources/Prototypes/_CorvaxGoob/Recipes/Lathes/tiles.yml @@ -0,0 +1,249 @@ +# Wood + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodLargeRed + result: FloorTileItemWoodLargeRed + iconPath: /Textures/_Corvax/Tiles/wood_large_red.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodLargeLight + result: FloorTileItemWoodLargeLight + iconPath: /Textures/_Corvax/Tiles/wood_large_light.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodLargeDark + result: FloorTileItemWoodLargeDark + iconPath: /Textures/_Corvax/Tiles/wood_large_dark.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodLargeBlack + result: FloorTileItemWoodLargeBlack + iconPath: /Textures/_Corvax/Tiles/wood_large_black.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodRed + result: FloorTileItemWoodRed + iconPath: /Textures/_Corvax/Tiles/wood_red.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodLight + result: FloorTileItemWoodLight + iconPath: /Textures/_Corvax/Tiles/wood_light.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodDark + result: FloorTileItemWoodDark + iconPath: /Textures/_Corvax/Tiles/wood_dark.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodBlack + result: FloorTileItemWoodBlack + iconPath: /Textures/_Corvax/Tiles/wood_black.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodParquet + result: FloorTileItemWoodParquet + iconPath: /Textures/_Corvax/Tiles/wood_parquet.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodParquetRed + result: FloorTileItemWoodParquetRed + iconPath: /Textures/_Corvax/Tiles/wood_parquet_red.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodParquetLight + result: FloorTileItemWoodParquetLight + iconPath: /Textures/_Corvax/Tiles/wood_parquet_light.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodParquetDark + result: FloorTileItemWoodParquetDark + iconPath: /Textures/_Corvax/Tiles/wood_parquet_dark.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodParquetBlack + result: FloorTileItemWoodParquetBlack + iconPath: /Textures/_Corvax/Tiles/wood_parquet_black.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodChess + result: FloorTileItemWoodChess + iconPath: /Textures/_Corvax/Tiles/wood_chess.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodChessRed + result: FloorTileItemWoodChessRed + iconPath: /Textures/_Corvax/Tiles/wood_chess_red.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodChessLight + result: FloorTileItemWoodChessLight + iconPath: /Textures/_Corvax/Tiles/wood_chess_light.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodChessDark + result: FloorTileItemWoodChessDark + iconPath: /Textures/_Corvax/Tiles/wood_chess_dark.png + +- type: latheRecipe + parent: BaseWoodTileRecipe + id: FloorTileItemWoodChessBlack + result: FloorTileItemWoodChessBlack + iconPath: /Textures/_Corvax/Tiles/wood_chess_black.png + +# Other + +- type: latheRecipe + id: FloorTileItemGold + result: FloorTileItemGold + categories: + - Tiles + materials: + Gold: 25 + iconPath: /Textures/Tiles/gold.png + +- type: latheRecipe + id: FloorTileItemSilver + result: FloorTileItemSilver + categories: + - Tiles + materials: + Silver: 25 + iconPath: /Textures/Tiles/silver.png + +- type: latheRecipe + parent: BaseSteelTileRecipe + id: FloorTileItemRockVault + result: FloorTileItemRockVault + iconPath: /Textures/Tiles/rock_vault.png + +- type: latheRecipe + parent: BaseSteelTileRecipe + id: FloorTileItemLino + result: FloorTileItemLino + iconPath: /Textures/Tiles/lino.png + +- type: latheRecipe + parent: BaseSteelTileRecipe + id: FloorTileItemArcadeBlue + result: FloorTileItemArcadeBlue + iconPath: /Textures/Tiles/arcadeblue.png + +- type: latheRecipe + parent: BaseSteelTileRecipe + id: FloorTileItemArcadeBlue2 + result: FloorTileItemArcadeBlue2 + iconPath: /Textures/Tiles/arcadeblue2.png + +- type: latheRecipe + parent: BaseSteelTileRecipe + id: FloorTileItemArcadeRed + result: FloorTileItemArcadeRed + iconPath: /Textures/Tiles/arcadered.png + +- type: latheRecipe + id: FloorTileItemCarpetClown + result: FloorTileItemCarpetClown + iconPath: /Textures/Tiles/carpetclown.png + categories: + - Tiles + materials: + Steel: 25 + +- type: latheRecipe + id: FloorTileItemCarpetOffice + result: FloorTileItemCarpetOffice + iconPath: /Textures/Tiles/carpetoffice.png + categories: + - Tiles + materials: + Steel: 25 + +# Faux + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileAstroSnowDug + result: FloorTileItemAstroSnowDug + iconPath: /Textures/Tiles/Planet/Snow/snow_dug.png + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileItemAstroChromite + result: FloorTileItemAstroChromite + iconPath: /Textures/Tiles/chromite.png + +# Shuttle + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FloorTileItemShuttleWhite + result: FloorTileItemShuttleWhite + iconPath: /Textures/Tiles/shuttlewhite.png + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FloorTileItemShuttleRed + result: FloorTileItemShuttleRed + iconPath: /Textures/Tiles/shuttlered.png + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FloorTileItemShuttleOrange + result: FloorTileItemShuttleOrange + iconPath: /Textures/Tiles/shuttleorange.png + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FloorTileItemShuttleGrey + result: FloorTileItemShuttleGrey + iconPath: /Textures/Tiles/shuttlegrey.png + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FloorTileItemShuttleBlue + result: FloorTileItemShuttleBlue + iconPath: /Textures/Tiles/shuttleblue.png + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FloorTileItemShuttlePurple + result: FloorTileItemShuttlePurple + iconPath: /Textures/Tiles/shuttlepurple.png + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FloorTileItemShuttleBlack + result: FloorTileItemShuttleBlack + iconPath: /Textures/Tiles/shuttleblack.png + +# Marble + +- type: latheRecipe + id: FloorTileItemUraniumMarble + result: FloorTileItemUraniumMarble + iconPath: /Textures/Tiles/uranium_marble.png + categories: + - Tiles + - Marble + materials: + Steel: 25 + Uranium: 25 + Glass: 25 diff --git a/Resources/Prototypes/_CorvaxGoob/Stacks/Tiles/faux.yml b/Resources/Prototypes/_CorvaxGoob/Stacks/Tiles/faux.yml new file mode 100644 index 000000000000..d36f9aa29953 --- /dev/null +++ b/Resources/Prototypes/_CorvaxGoob/Stacks/Tiles/faux.yml @@ -0,0 +1,11 @@ +- type: stack + parent: BaseTileStack + id: FauxTileAstroChromite + name: stack-astro-chromite + spawn: FauxTileItemAstroChromite + +- type: stack + parent: BaseTileStack + id: FauxTileAstroSnowDug + name: stack-astro-snow-dug + spawn: FauxTileItemAstroSnowDug diff --git a/Resources/Prototypes/_CorvaxGoob/Tiles/floors.yml b/Resources/Prototypes/_CorvaxGoob/Tiles/floors.yml new file mode 100644 index 000000000000..27cddd4da13e --- /dev/null +++ b/Resources/Prototypes/_CorvaxGoob/Tiles/floors.yml @@ -0,0 +1,35 @@ +- type: tile + id: FauxAstroChromite + parent: BaseStationTile + name: tiles-astro-chromite + sprite: /Textures/Tiles/chromite.png + variants: 7 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepAsteroid + itemDrop: FloorTileItemAstroChromite + tileRipResistance: 50 # Goob + +- type: tile + id: FauxAstroSnowDug + parent: BaseStationTile + name: tiles-astro-snow-dug + sprite: /Textures/Tiles/Planet/Snow/snow_dug.png + edgeSpritePriority: 1 + edgeSprites: + South: /Textures/Tiles/Planet/Snow/snow_dug_double_edge_south.png + East: /Textures/Tiles/Planet/Snow/snow_dug_double_edge_east.png + North: /Textures/Tiles/Planet/Snow/snow_dug_double_edge_north.png + West: /Textures/Tiles/Planet/Snow/snow_dug_double_edge_west.png + deconstructTools: [ Cutting ] + itemDrop: FloorTileItemAstroSnowDug + footstepSounds: + collection: FootstepSnow diff --git a/Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/chromite.png b/Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/chromite.png new file mode 100644 index 0000000000000000000000000000000000000000..a6439871db6a57cad2494097bd10a431cb6f1013 GIT binary patch literal 422 zcmV;X0a^ZuP)Px$U`a$lR9J=Wl`%`iFc^m4lTJNCX^Sovl`bMU34;H@-|K%61SgkU$|;>Z(hx&4 z1CV<1?ICT~_K@a!O+nicy+L9t;OZm%8>N<2wGlZeEC0Q@k3R2(_WPzs7=RSxr{jv_!RUN2k-3aNNI89}Q- zH8x_b1ehIfCiA^u*N|d2FCsD4a|I+-{dEFUNZ+`|rYA;SPzc&usA)ZIw?mrGT0oPW zWyo39>;HcjPzVa&3*dV}En?2jCktpY)oMo((6pB>!B{D5N;T;s(jp`qevF2kVPbs( zNto6>0Q|iV`$TGIY*;p5!20ub0d)PpByn$ovbrgy;wXQ_!*SaD0=!3^Z@r2f Qy8r+H07*qoM6N<$f=0crlmGw# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/meta.json new file mode 100644 index 000000000000..f8bc78e8389f --- /dev/null +++ b/Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "edited from original by _CorvaxGoob", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "chromite" + }, + { + "name": "snow-dug" + } + ] +} diff --git a/Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/snow-dug.png b/Resources/Textures/_CorvaxGoob/Objects/Tiles/tile.rsi/snow-dug.png new file mode 100644 index 0000000000000000000000000000000000000000..64c31adc8614e94b5151b730764631654188cf71 GIT binary patch literal 867 zcmV-p1DyPcP)Px&9Z5t%R9J=Wlub_?R}_Yyd+&H4xPU#z*nlBmLX%Xr(yAglNJ;VjW2)sBY;Et-51N?BAeCS=yd-gF2KV@oufBQm#&5_t z03C*;GI^puFxmhhgycNvkeqi|DLepRF`Y+;A$`BadEbi#i0wevtMTu_GXVO23!@E%;`^^b zG=96maNsk1)k6rFn_EO$3TY`!WNr`Oq9WnM@P(T*en8nx{t?6Oo*E=(n3JEahJRhM?D|;hmI`wuLog zBjk-1EFPdydx_D8{N}s3)qemuJ^Br0TZll>_gi?43ek8>cD0CCFJsNx2r0=dZ^Qz` zj=-1*Xk-Pn zvTp6{A}xjAZjg2gNTnuQ;bhhUSjunGIxFM18?gYf9RNsWR?wp{t+O&Jk(d;gN=-b= zg(5VRLq`{Ot12 zBrF4a;hQrv_i{xRwC(40t}Vp}9PC8`ARGal;b%@G{Py8WzO>hQ10bA&lO&n11S%Zr zX|t5Tb={)j09D~(7*1aTXLDD9=a)}K0wym3;o9nl85hE}@5kcaWF;VcPyTbt@X1P` z!l}LtM_`kbpbgyfJTXmEeBU2;8g_vr1BPLY7eF64g3$3Z)au}TC%c_#$9*Wr0UP`= zs)Gl4E-UTu>Lxe>7&Hyl6^`8wxN67X7@C73&#A#ez2oQ8x`CC+2R@y^-+R5;a-4d?!#62P2rWZ>UY zJSUtDy$@gscphBr)&asCysm5aDaf|Bd+_e!Q3b$x3J4EYpNzN=9(+8gXU?UNr4HxC<=+=Sjw`T_cJ^NjtE3iG@k$)I7EavO|>C7=VY}r?062(alj`3jE3M< z*U2i_O??Os0h2yMeT8GS1FqXKIQs2m>Z1(W+1;jNc-ftBdOrroII9Q%PAIQ7a4P|G z!Xe{$Els;VSSQ^g8Hqcv<)*EetW=wZ-^ R*LeT{002ovPDHLkV1noI(Z2uy literal 0 HcmV?d00001 From 5cafa6afb4e2ae441bc8a7d0830c6ac20e39234c Mon Sep 17 00:00:00 2001 From: KillanGenifer Date: Mon, 31 Aug 2026 23:34:06 +0700 Subject: [PATCH 3/3] part 3 --- Content.Client/Lathe/UI/LatheMenu.xaml.cs | 4 ++-- Resources/Prototypes/Entities/Structures/Walls/walls.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs index e6369dce938e..c2029f042ebc 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs @@ -430,14 +430,14 @@ public Control GetRecipeDisplayControl(LatheRecipePrototype recipe) textRect.Texture = _spriteSystem.Frame0(recipe.Icon); return textRect; } - else if (recipe.IconPath is { } iconPath) + 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) // CorvaxGoob + if (recipe.Result is { } result) { var entProtoView = new EntityPrototypeView(); entProtoView.SetPrototype(result); diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 9f1e2e9cff1a..60f0c76bc4ae 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -527,7 +527,7 @@ - type: IconSmooth key: walls base: plastic - - type: Appearance + - type: Appearance # CorvaxGoob - type: Paintable # CorvaxGoob group: Walls - type: SprayableWall # CorvaxGoob