VigersRay 1b725c9db8 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml		2024-06-01 09:38:18 +03:00
..
Commands	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Components	Fix shuttle audio clipping (#27527)	2024-05-29 17:32:20 +10:00
Events	Give nukies the ability to declare war for a TC boost (#19291)	2023-08-29 23:56:20 -08:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-01 09:38:18 +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