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
..
Arachnid.xml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Diona.xml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-11 14:05:37 +03:00
Dwarf.xml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Human.xml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Moth.xml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Reptilian.xml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
SlimePerson.xml	Апстрим перевода (#327)	2024-08-28 22:28:37 +03:00
Species.xml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-11 14:05:37 +03:00
Vox.xml	vox guidebook update poison regen (#33739)	2024-12-06 09:43:11 +01:00