]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Ironsands Structures (#39793)
authorAearo-Deepwater <77557990+Aearo-Deepwater@users.noreply.github.com>
Sat, 3 Jan 2026 06:54:00 +0000 (23:54 -0700)
committerGitHub <noreply@github.com>
Sat, 3 Jan 2026 06:54:00 +0000 (06:54 +0000)
commitfc995820df3d72a0040300ecd9c51be26096b5d7
tree331a9683b3f1ec712d5e583f954bbba53f9e91bc
parentbdbc1480549b546469af9cd666f97f7b01beaa23
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
77 files changed:
Resources/Locale/en-US/stack/stacks.ftl
Resources/Locale/en-US/tiles/tiles.ftl
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Resources/Prototypes/Entities/Structures/Decoration/statues.yml
Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
Resources/Prototypes/Entities/Structures/Walls/walls.yml
Resources/Prototypes/Entities/Structures/ironsand_steps.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/stairs.yml
Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
Resources/Prototypes/Recipes/Lathes/tiles.yml
Resources/Prototypes/Research/civilianservices.yml
Resources/Prototypes/Stacks/Tiles/concrete.yml
Resources/Prototypes/Stacks/Tiles/faux.yml
Resources/Prototypes/Tiles/floors.yml
Resources/Prototypes/Tiles/ironsand.yml [new file with mode: 0644]
Resources/Prototypes/Tiles/plating.yml
Resources/Textures/Objects/Tiles/tile.rsi/astro-ironsand.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/ironsand-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/ironsand.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-mono.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete-smooth.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/ironsandconcrete.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/meta.json
Resources/Textures/Structures/Decoration/ironsand_statue.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar.png [new file with mode: 0644]
Resources/Textures/Structures/Decoration/ironsand_statue.rsi/small_pillar_2.png [new file with mode: 0644]
Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/inverse_pillar.png [new file with mode: 0644]
Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Decoration/ironsand_statue_tall.rsi/pillar_of_weh.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closed.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/encrusted_ironstone_door.rsi/opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closed.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_bright.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/MineralDoors/ironstone_door.rsi/runes_dim.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick0.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick1.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick2.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick3.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick4.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick5.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick6.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/cobblebrick7.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/full.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/cobblebrick_ironsand.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Walls/rock.rsi/ironsandstone.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_east.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_north.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_south.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/rock.rsi/ironsandstone_west.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/rock.rsi/meta.json
Resources/Textures/Structures/ironsand_steps.rsi/corner_concave.png [new file with mode: 0644]
Resources/Textures/Structures/ironsand_steps.rsi/corner_convex.png [new file with mode: 0644]
Resources/Textures/Structures/ironsand_steps.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/ironsand_steps.rsi/straight.png [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/ironsand_packed.png [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/ironsand_paved.png [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/ironsand_paved_border_e.png [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/ironsand_paved_border_n.png [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/ironsand_paved_border_s.png [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/ironsand_paved_border_w.png [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/ironsand_plating.png [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/ironsand_tile.png [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/ironsand_uneven_paved.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_mono.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Concrete/ironsandconcrete_smooth.png [new file with mode: 0644]