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
..
Effects	upstream	2024-09-16 12:40:23 +03:00
Loadout.cs	Fix RoleLoadout equality (#28737)	2024-06-15 16:52:49 +10:00
LoadoutGroupPrototype.cs	Hidden loadout groups (#29170)	2024-06-19 10:26:46 +10:00
LoadoutPrototype.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-05 17:22:05 +03:00
RoleLoadout.cs	upstream	2024-09-16 12:40:23 +03:00
RoleLoadoutPrototype.cs	Localize ai dataset names (#33608)	2024-12-06 16:38:00 +01:00