From: Aearo-Deepwater <77557990+Aearo-Deepwater@users.noreply.github.com> Date: Sat, 3 Jan 2026 06:54:00 +0000 (-0700) Subject: Ironsands Structures (#39793) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=fc995820df3d72a0040300ecd9c51be26096b5d7;p=space-station-14.git Ironsands Structures (#39793) * Add 6 new ironsand tiles Ironsand plating and ironsand tile are based on the asteroid plating and asteroid tile tiles. Ironsand concrete tiles are based on the concrete and gray concrete tiles. Packed ironsand is slightly based on smooth gray concrete, but mostly original. * Add ironsand cobble wall * Finish adding tile objects for ironsand concrete tiles Includes inhands, even though the other concrete tiles don't even have 'em. * Add cutter recipes for ironsand concrete I'm sad that I can't require iron ore for these recipes. Iron ore can't go in a cutter, though, and changing that seems like it'd be more complicated than it's worth. Assuming I don't just make the thing accept any and all ores, which... um. * Delete temporary .swp file that shouldn't have been in the repo to begin with * Add ironsand pavement tile * Add ironsand stone door * Add ironsandstone walls * Improve packed ironsand texture * Add ironsand step * Add ironsand step corner * Add three mysterious, runed pillars * Lighten ironsand wall border * Replace art for paved ironsand * Make steps more closely match paved ironsand tiles * Increase border contrast of ironstone door * Add fake "astro-" versions of ironsand tiles * Add second tall pillar sprite * Add prototype for second tall statue * Make astro-ironsand researchable and latheable * Update corner step texture to match straight steps * Add corner steps that go the other way * Add door variant to match cobbled ironsand wall * Fix license for ironsand step sprites * Darken ironsandstone walls for better contrast * Update ironstone doors to match walls and be more distinct * Remove merge conflict detritus * Fix duplicate component * Update tile stack prototypes * Add detail to copyright info * Improve ironstone wall and door destruction * Normalize ironsand statue prototypes * Normalize ironsand tile object prototypes * Move ironsand plating in with the rest of the plating tiles * Remove .gitignore additions I might just make a new PR just for this, though. I'm very tempted. * Add sound effect to ironsand step destruction * Add abstract base class to stairs and steps * Remove redundant destruction trigger behavior from cardboard door * Add destruction behavior to ironsand statues * Fix up ironsand step prototypes * Remove redundant bits from ironsandstone wall prototypes * Remove ironstone door crush behavior * Add individual ironstone statue bounding boxes * Make ironstone statues shootable * Tweak ironsand statue bounding boxes --- diff --git a/Resources/Locale/en-US/stack/stacks.ftl b/Resources/Locale/en-US/stack/stacks.ftl index 6ff0906b83..7a9898ea10 100644 --- a/Resources/Locale/en-US/stack/stacks.ftl +++ b/Resources/Locale/en-US/stack/stacks.ftl @@ -217,6 +217,9 @@ stack-gray-concrete-smooth = gray concrete smooth stack-old-concrete-tile = old concrete tile stack-old-concrete-mono-tile = old concrete mono tile stack-old-concrete-smooth = old concrete smooth +stack-ironsand-concrete-tile = ironsand concrete tile +stack-ironsand-concrete-mono-tile = ironsand concrete mono tile +stack-ironsand-concrete-smooth = ironsand concrete smooth stack-silver-floor-tile = silver floor tile stack-bcircuit-floor-tile = bcircuit floor tile stack-grass-floor-tile = grass floor tile @@ -248,3 +251,5 @@ stack-white-marble-floor = white marble floor stack-dark-marble-floor = dark marble floor stack-plasma-marble-floor = plasmarble floor stack-uranium-marble-floor = uranium marble floor +stack-astro-ironsand-floor = astro-ironsand floor +stack-astro-ironsand-floor-borderless = borderless astro-ironsand floor diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index d9fe984c51..77cbce4d89 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -136,6 +136,8 @@ tiles-astro-ice = astro-ice tiles-astro-snow = astro-snow tiles-astro-asteroid-sand = asteroid astro-sand tiles-astro-asteroid-sand-borderless = borderless asteroid astro-sand +tiles-astro-ironsand = astro-ironsand +tiles-astro-ironsand-borderless = borderless astro-ironsand tiles-desert-astro-sand = desert astro-sand tiles-wood-large = large wood tiles-xeno-floor = xeno floor @@ -148,3 +150,10 @@ tiles-white-marble = white marble tile tiles-dark-marble = dark marble tile tiles-plasma-marble = plasmarble tile tiles-uranium-marble = uranium marble tile +tiles-ironsand-plating = ironsand plating +tiles-ironsand-tile = ironsand tile +tiles-ironsand-concrete-tile = ironsand concrete tile +tiles-ironsand-concrete-slab = ironsand concrete slab +tiles-ironsand-concrete-smooth = smooth ironsand concrete floor +tiles-ironsand-packed = packed ironsand +tiles-ironsand-paved = paved ironsand diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 05d4215d3e..1bb7b8e626 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -997,6 +997,50 @@ - type: Stack stackType: FloorTileOldConcreteSmooth +- type: entity + parent: FloorTileItemBase + id: FloorTileItemIronsandConcrete + name: iron sand concrete tile + components: + - type: Sprite + state: ironsandconcrete + - type: Item + heldPrefix: ironsandconcrete + - type: FloorTile + outputs: + - Plating + - FloorIronsandConcrete + - type: Stack + stackType: FloorTileIronsandConcrete + +- type: entity + parent: FloorTileItemIronsandConcrete + id: FloorTileItemIronsandConcreteMono + name: iron sand concrete mono tile + components: + - type: Sprite + state: ironsandconcrete-mono + - type: FloorTile + outputs: + - Plating + - FloorIronsandConcreteMono + - type: Stack + stackType: FloorTileIronsandConcreteMono + +- type: entity + parent: FloorTileItemIronsandConcrete + id: FloorTileItemIronsandConcreteSmooth + name: iron sand concrete smooth + components: + - type: Sprite + state: ironsandconcrete-smooth + - type: FloorTile + outputs: + - Plating + - FloorIronsandConcreteSmooth + - type: Stack + stackType: FloorTileIronsandConcreteSmooth + # Carpets - type: entity name: blue arcade floor @@ -1609,6 +1653,40 @@ - type: Stack stackType: FloorTileAstroAsteroidSand +- type: entity + parent: FloorTileItemBase + id: FloorTileItemAstroIronsand + name: astro-ironsand + description: Fake red sand. Imported from fake Mars. + components: + - type: Sprite + state: astro-ironsand + - type: Item + heldPrefix: ironsand + - type: FloorTile + outputs: + - Plating + - FloorAstroIronsand + - type: Stack + stackType: FloorTileAstroIronsand + +- type: entity + parent: FloorTileItemBase + id: FloorTileItemAstroIronsandBorderless + name: borderless astro-ironsand + description: Fake red sand. Imported from fake Mars. + components: + - type: Sprite + state: ironsand + - type: Item + heldPrefix: ironsand + - type: FloorTile + outputs: + - Plating + - FloorAstroIronsandBorderless + - type: Stack + stackType: FloorTileAstroIronsandBorderless + - type: entity parent: FloorTileItemBase id: FloorTileItemDesertAstroSand diff --git a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml index 1781190e29..3e6f874ce1 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml @@ -41,3 +41,124 @@ - type: Construction graph: BananiumStatueClown node: bananiumStatue + +# Ironsand Statues + +- type: entity + abstract: true + parent: BaseStructure + id: BaseIronsandStatue + description: A mysterious statue found in a desert of iron sand. + components: + - type: Sprite + noRot: true + drawdepth: Mobs + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Rock + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 # Overkill + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + SteelOre1: + min: 1 + max: 2 + +- type: entity + parent: BaseIronsandStatue + id: StatueIronsandSmall + name: ironsand small statue + components: + - type: Sprite + sprite: Structures/Decoration/ironsand_statue.rsi + state: small_pillar + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 60 + mask: + - MachineMask + layer: + - MachineLayer + +- type: entity + parent: BaseIronsandStatue + id: StatueIronsandSmall2 + name: ironsand small statue + components: + - type: Sprite + sprite: Structures/Decoration/ironsand_statue.rsi + state: small_pillar_2 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.35,-0.35,0.35,0.35" + density: 60 + mask: + - MachineMask + layer: + - MachineLayer + +- type: entity + parent: BaseIronsandStatue + id: StatueIronsandTall + name: ironsand tall statue + components: + - type: Sprite + sprite: Structures/Decoration/ironsand_statue_tall.rsi + state: pillar_of_weh + offset: "0.0,0.5" + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.30,-0.30,0.30,0.30" + density: 60 + mask: + - MachineMask + layer: + - MachineLayer + +- type: entity + parent: BaseIronsandStatue + id: StatueIronsandTall2 + name: ironsand tall statue + components: + - type: Sprite + sprite: Structures/Decoration/ironsand_statue_tall.rsi + state: inverse_pillar + offset: "0.0,0.5" + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.1,0.45,0.1" + density: 60 + mask: + - MachineMask + layer: + - MachineLayer diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index e9faaece39..35261b1506 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -367,3 +367,62 @@ MaterialCardboard: min: 3 max: 5 + +- type: entity + parent: BaseMaterialDoorNavMap + id: IronstoneDoor + name: ironstone door + description: A mysterious door made of rune-etched stone. + components: + - type: Sprite + sprite: Structures/Doors/MineralDoors/ironstone_door.rsi + - type: Door + openSound: + path: /Audio/Effects/stonedoor_openclose.ogg + closeSound: + path: /Audio/Effects/stonedoor_openclose.ogg + - type: RCDDeconstructable + deconstructable: false + - type: Damageable + damageModifierSet: Rock + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: *OverkillBehavior + - trigger: + !type:DamageTrigger + damage: 250 # A pickaxe can destroy this in two hits, since the door is rock. + behaviors: &IronstoneDestructionBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + SteelOre1: + min: 0 + max: 1 + +- type: entity + parent: IronstoneDoor + id: EncrustedIronstoneDoor + name: encrusted ironstone door + description: A stone door covered in nacreous blobs of an unknown substance. + components: + - type: Sprite + sprite: Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 500 + behaviors: *OverkillBehavior + - trigger: + !type:DamageTrigger + damage: 375 + behaviors: *IronstoneDestructionBehavior diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index d3f0d0e2cb..af76eca087 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -491,6 +491,37 @@ oreChance: 0.33 oreRarityPrototypeId: RandomOreDistributionStandard +- type: entity + id: IronSandstone + parent: AsteroidRock + name: ironsandstone + suffix: no ore yield + components: + - type: Icon + state: ironsandstone + - type: Sprite + sprite: Structures/Walls/rock.rsi + layers: + - state: ironsandstone + - map: [ "enum.EdgeLayer.South" ] + state: ironsandstone_south + - map: [ "enum.EdgeLayer.East" ] + state: ironsandstone_east + - map: [ "enum.EdgeLayer.North" ] + state: ironsandstone_north + - map: [ "enum.EdgeLayer.West" ] + state: ironsandstone_west + +- type: entity + id: IronSandstoneMining + parent: IronSandstone + name: ironsandstone + suffix: higher ore yield + components: + - type: OreVein + oreChance: 0.33 + oreRarityPrototypeId: RandomOreDistributionStandard + # Ore veins - type: entity id: IronRockCoal diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 8fbc14393b..ca6012d9e5 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -1659,6 +1659,40 @@ key: cobblebricks base: cobblebrick +- type: entity + parent: WallCobblebrick + id: WallIronsandCobblebrick + name: ironsand brick wall + description: The pale, rounded shapes that make up this wall look strikingly different from the iron sands they were allegedly made from. + components: + - type: Sprite + sprite: Structures/Walls/cobblebrick_ironsand.rsi + - type: Icon + sprite: Structures/Walls/cobblebrick_ironsand.rsi + - type: IconSmooth + key: cobblebricks + base: cobblebrick + - type: RCDDeconstructable + deconstructable: false + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + SteelOre1: + min: 0 + max: 2 + # Cardboard - type: entity diff --git a/Resources/Prototypes/Entities/Structures/ironsand_steps.yml b/Resources/Prototypes/Entities/Structures/ironsand_steps.yml new file mode 100644 index 0000000000..67ce012c2e --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/ironsand_steps.yml @@ -0,0 +1,52 @@ +- type: entity + parent: BaseFloorDecoration + id: IronsandStep + name: ironsand step + description: Takes your ironsand up a level. + components: + - type: Sprite + sprite: Structures/ironsand_steps.rsi + state: straight + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Rock + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 500 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + SteelOre1: + min: 0 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: IronsandStep + id: IronsandStepConvexCorner + name: ironsand step convex corner + components: + - type: Sprite + state: corner_convex + +- type: entity + parent: IronsandStep + id: IronsandStepConcaveCorner + name: ironsand step concave corner + components: + - type: Sprite + state: corner_concave diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml index a371f93567..57b2947c95 100644 --- a/Resources/Prototypes/Entities/Structures/stairs.yml +++ b/Resources/Prototypes/Entities/Structures/stairs.yml @@ -1,22 +1,29 @@ +- type: entity + abstract: true + id: BaseFloorDecoration + placement: + mode: SnapgridCenter + components: + - type: Transform + anchored: true + - type: Clickable + - type: Sprite + drawdepth: FloorTiles + - type: entity id: Stairs + parent: BaseFloorDecoration name: stairs suffix: Steel description: The greatest invention since rocket-propelled grenades. - placement: - mode: SnapgridCenter components: - type: Anchorable flags: - Anchorable - type: Rotatable - - type: Clickable - type: Sprite sprite: Structures/stairs.rsi state: stairs_steel - drawdepth: FloorTiles - - type: Transform - anchored: true - type: Damageable damageContainer: StructuralInorganic damageModifierSet: Metallic diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml index a3286709cb..4be7fec27d 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml @@ -68,6 +68,9 @@ - FloorTileItemOldConcrete - FloorTileItemOldConcreteMono - FloorTileItemOldConcreteSmooth + - FloorTileItemIronsandConcrete + - FloorTileItemIronsandConcreteMono + - FloorTileItemIronsandConcreteSmooth - type: latheRecipePack id: CircuitFloorsStatic @@ -96,3 +99,5 @@ - FauxTileAstroSnow - FauxTileAstroAsteroidSand - FauxTileDesertAstroSand + - FauxTileAstroIronsand + - FauxTileAstroIronsandBorderless diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml index a28f1b7a50..e43e69e934 100644 --- a/Resources/Prototypes/Recipes/Lathes/tiles.yml +++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml @@ -346,6 +346,21 @@ id: FloorTileItemOldConcreteSmooth result: FloorTileItemOldConcreteSmooth +- type: latheRecipe + parent: BaseConcreteTileRecipe + id: FloorTileItemIronsandConcrete + result: FloorTileItemIronsandConcrete + +- type: latheRecipe + parent: BaseConcreteTileRecipe + id: FloorTileItemIronsandConcreteMono + result: FloorTileItemIronsandConcreteMono + +- type: latheRecipe + parent: BaseConcreteTileRecipe + id: FloorTileItemIronsandConcreteSmooth + result: FloorTileItemIronsandConcreteSmooth + # Faux - type: latheRecipe parent: BaseFauxTileRecipe @@ -397,6 +412,16 @@ id: FauxTileDesertAstroSand result: FloorTileItemDesertAstroSand +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileAstroIronsand + result: FloorTileItemAstroIronsand + +- type: latheRecipe + parent: BaseFauxTileRecipe + id: FauxTileAstroIronsandBorderless + result: FloorTileItemAstroIronsandBorderless + # Marble - type: latheRecipe parent: BaseMarbleTileRecipe diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index 01407a8ae3..889df6b3d9 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -104,6 +104,8 @@ - FauxTileAstroSnow - FauxTileAstroAsteroidSand - FauxTileDesertAstroSand + - FauxTileAstroIronsand + - FauxTileAstroIronsandBorderless - type: technology id: BiochemicalStasis diff --git a/Resources/Prototypes/Stacks/Tiles/concrete.yml b/Resources/Prototypes/Stacks/Tiles/concrete.yml index a10b2e212e..108a7f56e8 100644 --- a/Resources/Prototypes/Stacks/Tiles/concrete.yml +++ b/Resources/Prototypes/Stacks/Tiles/concrete.yml @@ -53,3 +53,21 @@ id: FloorTileOldConcreteSmooth name: stack-old-concrete-smooth spawn: FloorTileItemOldConcreteSmooth + +- type: stack + parent: BaseTileStack + id: FloorTileIronsandConcrete + name: stack-ironsand-concrete-tile + spawn: FloorTileItemIronsandConcrete + +- type: stack + parent: BaseTileStack + id: FloorTileIronsandConcreteMono + name: stack-ironsand-concrete-mono-tile + spawn: FloorTileItemIronsandConcreteMono + +- type: stack + parent: BaseTileStack + id: FloorTileIronsandConcreteSmooth + name: stack-ironsand-concrete-smooth + spawn: FloorTileItemIronsandConcreteSmooth diff --git a/Resources/Prototypes/Stacks/Tiles/faux.yml b/Resources/Prototypes/Stacks/Tiles/faux.yml index 00c9e52525..48761bdfe8 100644 --- a/Resources/Prototypes/Stacks/Tiles/faux.yml +++ b/Resources/Prototypes/Stacks/Tiles/faux.yml @@ -53,3 +53,15 @@ id: FloorTileDesertAstroSand name: stack-desert-astro-sand-floor spawn: FloorTileItemDesertAstroSand + +- type: stack + parent: BaseTileStack + id: FloorTileAstroIronsand + name: stack-astro-ironsand-floor + spawn: FloorTileItemAstroIronsand + +- type: stack + parent: BaseTileStack + id: FloorTileAstroIronsandBorderless + name: stack-astro-ironsand-floor-borderless + spawn: FloorTileItemAstroIronsandBorderless diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index cd08bd618a..de0f0dd9b4 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -2071,6 +2071,26 @@ itemDrop: FloorTileItemDesertAstroSand weather: false +- type: tile + id: FloorAstroIronsand + name: tiles-astro-ironsand + parent: FloorAsteroidIronsand + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: FloorTileItemAstroIronsand + weather: false + +- type: tile + id: FloorAstroIronsandBorderless + name: tiles-astro-ironsand-borderless + parent: FloorAsteroidIronsandBorderless + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + itemDrop: FloorTileItemAstroIronsandBorderless + weather: false + - type: tile id: FloorWoodLarge name: tiles-wood-large diff --git a/Resources/Prototypes/Tiles/ironsand.yml b/Resources/Prototypes/Tiles/ironsand.yml new file mode 100644 index 0000000000..f1558d9f20 --- /dev/null +++ b/Resources/Prototypes/Tiles/ironsand.yml @@ -0,0 +1,98 @@ +- type: tile + id: FloorIronsandTile + name: tiles-ironsand-tile + sprite: /Textures/Tiles/Asteroid/ironsand_tile.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepAsteroid + heatCapacity: 10000 + +- type: tile + id: FloorIronsandConcrete + name: tiles-ironsand-concrete-tile + sprite: /Textures/Tiles/Planet/Concrete/ironsandconcrete.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemIronsandConcrete + heatCapacity: 10000 + +- type: tile + id: FloorIronsandConcreteMono + name: tiles-ironsand-concrete-slab + sprite: /Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemIronsandConcreteMono + heatCapacity: 10000 + +- type: tile + id: FloorIronsandConcreteSmooth + name: tiles-ironsand-concrete-smooth + sprite: /Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemIronsandConcreteSmooth + heatCapacity: 10000 + +- type: tile + id: IronsandPacked + name: tiles-ironsand-packed + sprite: /Textures/Tiles/Asteroid/ironsand_packed.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Space + isSubfloor: true + footstepSounds: + collection: FootstepAsteroid + friction: 1.5 + heatCapacity: 10000 + +- type: tile + id: IronsandPaved + name: tiles-ironsand-paved + sprite: /Textures/Tiles/Asteroid/ironsand_uneven_paved.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Space + isSubfloor: false + footstepSounds: + collection: FootstepTile + friction: 1.5 + heatCapacity: 10000 diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index 2879272a59..2a85222c3a 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -58,6 +58,17 @@ friction: 0.75 #a little less then actual snow heatCapacity: 10000 +- type: tile + id: PlatingIronsand + name: tiles-ironsand-plating + sprite: /Textures/Tiles/Asteroid/ironsand_plating.png + baseTurf: Lattice + isSubfloor: true + footstepSounds: + collection: FootstepPlating + friction: 1.5 + heatCapacity: 10000 + - type: tile id: Lattice name: tiles-lattice diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astro-ironsand.png b/Resources/Textures/Objects/Tiles/tile.rsi/astro-ironsand.png new file mode 100644 index 0000000000..07420fc23b Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/astro-ironsand.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-left.png new file mode 100644 index 0000000000..b678bffeb0 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-right.png new file mode 100644 index 0000000000..fa2c52bb79 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsand.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsand.png new file mode 100644 index 0000000000..ee24ca8ebf Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/ironsand.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-left.png new file mode 100644 index 0000000000..20cd2c5015 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-right.png new file mode 100644 index 0000000000..bfc1144f00 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-mono.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-mono.png new file mode 100644 index 0000000000..306a572ca5 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-mono.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-smooth.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-smooth.png new file mode 100644 index 0000000000..4d4fc66a82 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-smooth.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete.png b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete.png new file mode 100644 index 0000000000..f3ebee2b14 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index b1fb0057d7..52bc656cd4 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github), Astro-asteroid by kosticia (Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, additional attributions available in the Resources/Textures/Tiles/attributions.yml file. Ice tile and Snow tile modifications, Astreroid tile and in-hands created by Southbridge-fur (github), Astro-asteroid by kosticia (Github), Ironsands concrete variants modified from other concrete and inhands modified from generic inhands by SeaWyrm (github Aearo-Deepwater)", "size": { "x": 32, "y": 32 @@ -73,6 +73,23 @@ { "name": "oldconcrete-smooth" }, + { + "name": "ironsandconcrete" + }, + { + "name": "ironsandconcrete-mono" + }, + { + "name": "ironsandconcrete-smooth" + }, + { + "name": "ironsandconcrete-inhand-left", + "directions": 4 + }, + { + "name": "ironsandconcrete-inhand-right", + "directions": 4 + }, { "name": "gcircuit" }, @@ -600,6 +617,20 @@ "name": "asteroid-inhand-left", "directions": 4 }, + { + "name": "ironsand" + }, + { + "name": "astro-ironsand" + }, + { + "name": "ironsand-inhand-right", + "directions": 4 + }, + { + "name": "ironsand-inhand-left", + "directions": 4 + }, { "name": "xenofloor" }, @@ -618,10 +649,10 @@ { "name": "dark-squiggly" }, - { - "name": "white-marble" - }, - { + { + "name": "white-marble" + }, + { "name": "white-marble-inhand-left", "directions": 4 }, diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/meta.json b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/meta.json new file mode 100644 index 0000000000..e24b5b182f --- /dev/null +++ b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "small_pillar" + }, + { + "name": "small_pillar_2" + } + ] +} diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar.png b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar.png new file mode 100644 index 0000000000..b884d6d4a8 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar.png differ diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar_2.png b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar_2.png new file mode 100644 index 0000000000..5d61704593 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar_2.png differ diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/inverse_pillar.png b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/inverse_pillar.png new file mode 100644 index 0000000000..8f280eab5d Binary files /dev/null and b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/inverse_pillar.png differ diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/meta.json b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/meta.json new file mode 100644 index 0000000000..8bafff87e5 --- /dev/null +++ b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "pillar_of_weh" + }, + { + "name": "inverse_pillar" + } + ] +} diff --git a/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/pillar_of_weh.png b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/pillar_of_weh.png new file mode 100644 index 0000000000..16d7a1fbd7 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/pillar_of_weh.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closed.png b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closed.png new file mode 100644 index 0000000000..4161808430 Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closing.png b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closing.png new file mode 100644 index 0000000000..c072ef70dd Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/meta.json b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/meta.json new file mode 100644 index 0000000000..adc48a74f8 --- /dev/null +++ b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "closing", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "open", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "opening", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/open.png b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/open.png new file mode 100644 index 0000000000..6fec6a2494 Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/opening.png b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/opening.png new file mode 100644 index 0000000000..321f3a3469 Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closed.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closed.png new file mode 100644 index 0000000000..2af73b62ec Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closing.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closing.png new file mode 100644 index 0000000000..1855600c63 Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/meta.json b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/meta.json new file mode 100644 index 0000000000..b8c0934e8d --- /dev/null +++ b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "closing", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "open", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "opening", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "runes_dim" + }, + { + "name": "runes_bright" + } + ] +} diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/open.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/open.png new file mode 100644 index 0000000000..c12d23512e Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/opening.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/opening.png new file mode 100644 index 0000000000..06cd2785c4 Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_bright.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_bright.png new file mode 100644 index 0000000000..4f7b279f1c Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_bright.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_dim.png b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_dim.png new file mode 100644 index 0000000000..8a7daf6c89 Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_dim.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick0.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick0.png new file mode 100644 index 0000000000..5483a9bb0e Binary files /dev/null and b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick0.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick1.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick1.png new file mode 100644 index 0000000000..6065c97c7e Binary files /dev/null and b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick1.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick2.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick2.png new file mode 100644 index 0000000000..47714622e3 Binary files /dev/null and b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick2.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick3.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick3.png new file mode 100644 index 0000000000..6cd5ff6f25 Binary files /dev/null and b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick3.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick4.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick4.png new file mode 100644 index 0000000000..8a6429d911 Binary files /dev/null and b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick4.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick5.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick5.png new file mode 100644 index 0000000000..61bdb81ec8 Binary files /dev/null and b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick5.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick6.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick6.png new file mode 100644 index 0000000000..b658073c3e Binary files /dev/null and b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick6.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick7.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick7.png new file mode 100644 index 0000000000..032ed030a9 Binary files /dev/null and b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick7.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/full.png b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/full.png new file mode 100644 index 0000000000..dc159b8e48 Binary files /dev/null and b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/meta.json b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/meta.json new file mode 100644 index 0000000000..2f865df84d --- /dev/null +++ b/Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SeaWyrm (github Aearo-Deepwater) for SS14, based on the 'cobblebrick' sprites created by TheShuEd for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "cobblebrick0", + "directions": 4 + }, + { + "name": "cobblebrick1", + "directions": 4 + }, + { + "name": "cobblebrick2", + "directions": 4 + }, + { + "name": "cobblebrick3", + "directions": 4 + }, + { + "name": "cobblebrick4", + "directions": 4 + }, + { + "name": "cobblebrick5", + "directions": 4 + }, + { + "name": "cobblebrick6", + "directions": 4 + }, + { + "name": "cobblebrick7", + "directions": 4 + } + ] + } + diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone.png new file mode 100644 index 0000000000..0ad7dacb1f Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_east.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_east.png new file mode 100644 index 0000000000..e96818d434 Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_east.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_north.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_north.png new file mode 100644 index 0000000000..542b66959d Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_north.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_south.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_south.png new file mode 100644 index 0000000000..ed254568f3 Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_south.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_west.png b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_west.png new file mode 100644 index 0000000000..6f9e180b1c Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_west.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json index 9f649e0bbb..dc2dfe3059 100644 --- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/turf/walls.dmi, rock_bananium made by brainfood1183 (github) for ss14, rock_snow, rock_asteroid, \u0026 rock_wall and co from https://github.com/tgstation/tgstation/tree/e929cf39cded5207d63df1fa8521f41f2816b383. ironrock taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e, sand rock made by TheShuEd for ss14, https://github.com/tgstation/tgstation/blob/5f3e12178e1fbe75ae4b1ff12e256f61b5bdddd5/icons/turf/mining.dmi", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/turf/walls.dmi, rock_bananium made by brainfood1183 (github) for ss14, rock_snow, rock_asteroid, \u0026 rock_wall and co from https://github.com/tgstation/tgstation/tree/e929cf39cded5207d63df1fa8521f41f2816b383. ironrock taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e, sand rock made by TheShuEd for ss14, https://github.com/tgstation/tgstation/blob/5f3e12178e1fbe75ae4b1ff12e256f61b5bdddd5/icons/turf/mining.dmi, ironsandstone made by SeaWyrm (github Aearo-Deepwater) for SS14", "size": { "x": 32, "y": 32 @@ -88,6 +88,21 @@ { "name": "ironrock_west" }, + { + "name": "ironsandstone" + }, + { + "name": "ironsandstone_south" + }, + { + "name": "ironsandstone_east" + }, + { + "name": "ironsandstone_north" + }, + { + "name": "ironsandstone_west" + }, { "name": "rock_artifact_fragment" }, diff --git a/Resources/Textures/Structures/ironsand_steps.rsi/corner_concave.png b/Resources/Textures/Structures/ironsand_steps.rsi/corner_concave.png new file mode 100644 index 0000000000..3435f5a510 Binary files /dev/null and b/Resources/Textures/Structures/ironsand_steps.rsi/corner_concave.png differ diff --git a/Resources/Textures/Structures/ironsand_steps.rsi/corner_convex.png b/Resources/Textures/Structures/ironsand_steps.rsi/corner_convex.png new file mode 100644 index 0000000000..d8b15e56e7 Binary files /dev/null and b/Resources/Textures/Structures/ironsand_steps.rsi/corner_convex.png differ diff --git a/Resources/Textures/Structures/ironsand_steps.rsi/meta.json b/Resources/Textures/Structures/ironsand_steps.rsi/meta.json new file mode 100644 index 0000000000..1eaca47c43 --- /dev/null +++ b/Resources/Textures/Structures/ironsand_steps.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created for Space Station 14 by SeaWyrm (github Aearo-Deepwater)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "straight", + "directions": 4 + }, + { + "name": "corner_convex", + "directions": 4 + }, + { + "name": "corner_concave", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/ironsand_steps.rsi/straight.png b/Resources/Textures/Structures/ironsand_steps.rsi/straight.png new file mode 100644 index 0000000000..b3c6c98c8f Binary files /dev/null and b/Resources/Textures/Structures/ironsand_steps.rsi/straight.png differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_packed.png b/Resources/Textures/Tiles/Asteroid/ironsand_packed.png new file mode 100644 index 0000000000..cb977bdec4 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand_packed.png differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved.png new file mode 100644 index 0000000000..9724ec250c Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand_paved.png differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_e.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_e.png new file mode 100644 index 0000000000..2353c99318 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_e.png differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_n.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_n.png new file mode 100644 index 0000000000..869151e54d Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_n.png differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_s.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_s.png new file mode 100644 index 0000000000..854577a945 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_s.png differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_w.png b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_w.png new file mode 100644 index 0000000000..98108cc7bb Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand_paved_border_w.png differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_plating.png b/Resources/Textures/Tiles/Asteroid/ironsand_plating.png new file mode 100644 index 0000000000..bf95f4264d Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand_plating.png differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_tile.png b/Resources/Textures/Tiles/Asteroid/ironsand_tile.png new file mode 100644 index 0000000000..065935125f Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand_tile.png differ diff --git a/Resources/Textures/Tiles/Asteroid/ironsand_uneven_paved.png b/Resources/Textures/Tiles/Asteroid/ironsand_uneven_paved.png new file mode 100644 index 0000000000..3927000277 Binary files /dev/null and b/Resources/Textures/Tiles/Asteroid/ironsand_uneven_paved.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete.png b/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete.png new file mode 100644 index 0000000000..da10aecc47 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png b/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png new file mode 100644 index 0000000000..19163b1fe2 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png differ diff --git a/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png b/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png new file mode 100644 index 0000000000..fff7fa7a59 Binary files /dev/null and b/Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png differ