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
..
StationBiomeSystem.cs	Night on Europa (#27731)	2024-05-06 20:02:22 -07:00
StationJobsSystem.cs	Reduced Warning Count By 130 For Full Rebuilds (#26518)	2024-03-29 16:28:16 +11:00
StationJobsSystem.Roundstart.cs	Obsolete Logger cleanup for EntitySystems (#25941)	2024-03-10 01:15:13 +01:00
StationNameSystem.cs	Refactor stations to properly use entity prototypes. (stationsv3) (#16570)	2023-05-19 15:45:09 -05:00
StationSpawningSystem.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-11 01:41:28 +03:00
StationSystem.cs	Resolve all non-obsoleting warnings in content (#27934)	2024-05-11 20:13:58 -07:00