]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Clockwork structures and furniture (#24673)
authorMACMAN2003 <macman2003c@gmail.com>
Wed, 6 Mar 2024 00:25:59 +0000 (16:25 -0800)
committerGitHub <noreply@github.com>
Wed, 6 Mar 2024 00:25:59 +0000 (03:25 +0300)
commitf0e8695a91b787c8107ebf198309d92159463dc0
tree9345cfb5875ca094121263f677afdcc22a292821
parentb66bad25ca86d8f453fa20e739d2141d7f98ab5f
Clockwork structures and furniture (#24673)

* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor :skull:

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml
154 files changed:
Resources/Locale/en-US/tiles/tiles.ftl
Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
Resources/Prototypes/Catalog/Fills/Crates/materials.yml
Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
Resources/Prototypes/Entities/Objects/Materials/shards.yml
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
Resources/Prototypes/Entities/Structures/Walls/girders.yml
Resources/Prototypes/Entities/Structures/Walls/grille.yml
Resources/Prototypes/Entities/Structures/Walls/walls.yml
Resources/Prototypes/Entities/Structures/Windows/clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Reagents/Materials/glass.yml
Resources/Prototypes/Reagents/Materials/metals.yml
Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/Graphs/structures/girder_clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
Resources/Prototypes/Recipes/Construction/furniture.yml
Resources/Prototypes/Recipes/Construction/materials.yml
Resources/Prototypes/Recipes/Construction/structures.yml
Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml
Resources/Prototypes/Recipes/Crafting/tiles.yml
Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
Resources/Prototypes/Stacks/floor_tile_stacks.yml
Resources/Prototypes/Tiles/floors.yml
Resources/Prototypes/Tiles/plating.yml
Resources/Prototypes/tags.yml
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_2.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_3.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
Resources/Textures/Objects/Tiles/tile.rsi/brass-filled.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/brass.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/meta.json
Resources/Textures/Objects/Tiles/tile.rsi/reebe.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/deny_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/sparks.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/welded.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/assembly.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/deny_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/sparks.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/welded.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/bolted_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkdeny.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkspark.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/deny_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/emergency_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening_unlit.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/panel_open.png [new file with mode: 0644]
Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/welded.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/full.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_0.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_1.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_2.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_3.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_4.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_5.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_6.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_7.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/chairs.rsi/brass_chair.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
Resources/Textures/Structures/Walls/clock.rsi/clock0.png
Resources/Textures/Structures/Walls/clock.rsi/clock1.png
Resources/Textures/Structures/Walls/clock.rsi/clock2.png
Resources/Textures/Structures/Walls/clock.rsi/clock3.png
Resources/Textures/Structures/Walls/clock.rsi/clock4.png
Resources/Textures/Structures/Walls/clock.rsi/clock5.png
Resources/Textures/Structures/Walls/clock.rsi/clock6.png
Resources/Textures/Structures/Walls/clock.rsi/clock7.png
Resources/Textures/Structures/Walls/clock.rsi/full.png
Resources/Textures/Structures/Walls/clock.rsi/meta.json
Resources/Textures/Structures/Walls/clock.rsi/wall_gear.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/clockwork_grille.rsi/brokenratvargrille.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/clockwork_grille.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille.png [new file with mode: 0644]
Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille_diagonal.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Windows/directional.rsi/clock_window.png [new file with mode: 0644]
Resources/Textures/Structures/Windows/directional.rsi/meta.json
Resources/Textures/Tiles/Misc/clockwork/clockwork_floor.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/clock_lattice.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/meta.json [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebe.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebegame.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebelattice.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebemap.png [new file with mode: 0644]
Resources/Textures/Tiles/Misc/clockwork/reebespawn.png [new file with mode: 0644]