VigersRay 940710da9e Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/green_circuit.png # Resources/Textures/Tiles/steel.png		2024-10-02 15:50:00 +03:00
..
Airlocks	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 15:50:00 +03:00
assembly.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
edge_door_hazard.rsi	Fix some more rsis (#13107)	2022-12-20 09:37:34 +01:00
effects.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
MineralDoors	Adds Bananium (#14663)	2023-04-29 15:38:09 +10:00
secret_door.rsi	Респрайты стен, шлюзов, окон и плиток. (#33)	2024-06-07 11:06:08 +03:00
Shutters	Construction Blast door (#24050)	2024-01-15 15:49:08 +03:00
web_door.rsi	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
Windoors	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00