Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/adjectives.yml # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png # Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png # SpaceStation14.sln		2024-08-28 16:40:36 +03:00
..
BanMatcher.cs	Kick on ban for entire server group (#28649)	2024-08-20 23:31:33 +02:00
DatabaseRecords.cs	Fix database round start date issues (#26838)	2024-04-14 07:39:43 +02:00
ServerBanDef.cs	Kick on ban for entire server group (#28649)	2024-08-20 23:31:33 +02:00
ServerDbBase.cs	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-08-28 16:40:36 +03:00
ServerDbEntryManager.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
ServerDbManager.cs	Automated whitelists (#23985)	2024-08-27 18:01:17 +02:00
ServerDbPostgres.cs	Kick on ban for entire server group (#28649)	2024-08-20 23:31:33 +02:00
ServerDbPostgres.Notifications.cs	Fix server crash on shutdown due to DB notifications (#31379)	2024-08-24 01:45:13 +02:00
ServerDbSqlite.cs	Kick on ban for entire server group (#28649)	2024-08-20 23:31:33 +02:00
ServerRoleBanDef.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ServerRoleUnbanDef.cs
ServerUnbanDef.cs
UserDbDataManager.cs	Add job whitelist system (#28085)	2024-06-01 05:08:31 -07:00