VigersRay 9fd0e0cff7 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml		2024-06-21 18:08:24 +03:00
..
cargo_gifts.yml	make GameRule use entity category (#28294)	2024-06-03 08:39:25 -04:00
events.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-21 18:08:24 +03:00
meteorswarms.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-16 23:31:26 +03:00
midround.yml	Воров теперь больше	2024-06-13 16:31:45 +03:00
roundstart.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-21 18:08:24 +03:00
unknown_shuttles.yml	фикс ттсов	2024-06-14 22:36:46 +03:00
variation.yml	make GameRule use entity category (#28294)	2024-06-03 08:39:25 -04:00