Ed fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml

2024-07-28 20:58:48 +03:00

..

Commands

Shuttle console + FTL rework (#24430)

2024-03-03 18:39:19 +11:00

Components

Move vgroid much closer (#29943)

2024-07-28 13:14:18 +10:00

Events

Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)

2024-06-02 14:07:41 +10:00

Systems

Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream

2024-07-28 20:58:48 +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