space-station-14

mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-02-15 05:10:54 +01:00

Files

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

DatabaseRecords.cs

Fix database round start date issues (#26838 )

2024-04-14 07:39:43 +02:00

ServerBanDef.cs

Better notes and bans (#14228 )

2023-07-21 13:38:52 +02:00

ServerDbBase.cs

Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync

2024-05-15 18:53:52 +03:00

ServerDbEntryManager.cs

Log server ID in connection logs table (#21911 )