Morb0 d97a09543d Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Client/IoC/ClientContentIoC.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json		2024-05-15 18:53:52 +03:00
..
ArrivalsSystem.cs	Make FTL constants in ShuttleSystem into cvars (#27706)	2024-05-11 00:00:15 -07:00
DockingSignalControlSystem.cs	Dock device link port (#27646)	2024-05-06 13:59:01 +10:00
DockingSystem.cs	Fix drone console docking (#25822)	2024-03-04 16:46:45 +11:00
DockingSystem.Shuttle.cs	Fix arrivals not docking on spinning stations (#26033)	2024-03-12 23:57:35 +11:00
EmergencyShuttleSystem.Console.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03:00
EmergencyShuttleSystem.cs	Make FTL constants in ShuttleSystem into cvars (#27706)	2024-05-11 00:00:15 -07:00
RadarConsoleSystem.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
ShuttleConsoleSystem.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
ShuttleConsoleSystem.Drone.cs	Fix drone console docking (#25822)	2024-03-04 16:46:45 +11:00
ShuttleConsoleSystem.FTL.cs	Coordinates Disks & Shuttle FTL Travel (#23240)	2024-04-01 15:50:00 +11:00
ShuttleSystem.cs	Admin log shuttle gibbing + Make shuttle gibbing and immovable rods drop organs and correctly put player in ghost (#27114)	2024-04-20 16:27:38 +10:00
ShuttleSystem.FasterThanLight.cs	Make FTL constants in ShuttleSystem into cvars (#27706)	2024-05-11 00:00:15 -07:00
ShuttleSystem.GridFill.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleSystem.IFF.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
ShuttleSystem.Impact.cs	Revert "Fix chat bubbles (#25643)" (#25645)	2024-02-28 00:51:20 +11:00
SpaceGarbageSystem.cs	Salvage magnet revamp (#23119)	2024-01-04 14:25:32 +11:00
ThrusterSystem.cs	Revert "Fix turned off thrusters consume power" (#27755)	2024-05-07 20:52:18 +10:00