VigersRay a33b949c98 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs # Resources/Prototypes/Entities/Mobs/Player/human.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/Prototypes/Maps/train.yml		2024-08-07 22:57:31 +03:00
..
Commands	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Components	фиксы апстрима	2024-08-05 21:54:07 +03:00
Events	Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)	2024-06-02 14:07:41 +10:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-07 22:57:31 +03:00
DockingConfig.cs	Fix some docking configs (#17012)	2023-06-01 10:48:44 +10:00
DroneConsoleComponent.cs	Salvage magnet revamp (#23119)	2024-01-04 14:25:32 +11:00