VigersRay 83090d089f Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png		2024-07-13 12:55:55 +03:00
..
BUI	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Commands	Evac shuttle (#8931)	2022-06-26 15:20:45 +10:00
Systems	Add FTL arrival visuals (#29402)	2024-07-01 16:11:30 +10:00
UI	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-13 12:55:55 +03:00
FtlArrivalOverlay.cs	Add FTL arrival visuals (#29402)	2024-07-01 16:11:30 +10:00
ShuttleConsoleComponent.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ThrusterComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
ThrusterSystem.cs	Resolves ThrusterVisualizer is Obsolete (#13904)	2023-05-07 23:37:28 +10:00