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
..
Clothing	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 15:50:00 +03:00
Debugging	Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)	2024-07-25 05:24:00 -07:00
Effects	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
Guidebook	фиксы	2024-09-19 16:57:23 +03:00
Markers	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
Mobs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
Objects	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 15:50:00 +03:00
Stations	фиксы апстрима	2024-09-16 13:13:35 +03:00
Structures	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 15:50:00 +03:00
Tiles	Fix some descriptions (#30644)	2024-08-05 13:15:52 +10:00
Virtual	Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)	2024-07-25 05:24:00 -07:00
World	Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)	2024-07-25 05:24:00 -07:00
categories.yml	make objectives use entityCategory (#28269)	2024-06-03 09:23:52 -04:00
foldable.yml	Deploy foldable (#30000)	2024-08-02 17:05:12 +10:00