Vigers Ray bcd534952f Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/Names/arachnid_first.yml # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Prototypes/Datasets/Names/fake_human_first.yml # Resources/Prototypes/Datasets/Names/fake_human_last.yml # Resources/Prototypes/Datasets/Names/last.yml # Resources/Prototypes/Datasets/Names/vox.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Recipes/Lathes/mech_parts.yml # Resources/ServerInfo/Guidebook/Mobs/Vox.xml		2024-12-07 07:45:07 +03:00
..
Aliens	upstream	2024-09-16 12:40:23 +03:00
Animals	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-01 18:21:33 +03:00
Customization	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-29 00:28:18 +03:00
Demons	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Effects	Fire sprite change for mice (#26758)	2024-04-06 00:41:23 -04:00
Elemental	crystals drop shards and ore crab tweaks. (#20930)	2023-12-16 15:20:14 -07:00
Ghosts	Use new validate-rsis for workflow (#12997)	2022-12-20 06:31:17 +01:00
Pets	Dev mouse acorgillation (#32040)	2024-09-15 02:21:33 +10:00
Silicon	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-07 07:45:07 +03:00
Species	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-30 13:26:32 +03:00