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
..
cargo_gifts.yml	refactor event schedulers to use explicit game rules (#29320)	2024-08-14 15:21:01 +10:00
events.yml	фиксы	2024-09-19 16:57:23 +03:00
meteorswarms.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-16 15:21:56 +03:00
midround.yml	фиксы	2024-09-19 16:57:23 +03:00
pests.yml	fix: Snail event wasnt tabled (#31884)	2024-09-06 17:27:51 -06:00
random_sentience.yml	Re-add improved random sentience event (#29123)	2024-08-18 17:41:12 -06:00
roundstart.yml	upstream	2024-09-16 12:40:23 +03:00
unknown_shuttles.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 15:50:00 +03:00
variation.yml	make GameRule use entity category (#28294)	2024-06-03 08:39:25 -04:00