Morbo 50c80d2bd2 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Nuke/NukeComponent.cs # Resources/Prototypes/Voice/disease_emotes.yml		2023-04-29 14:53:32 +03:00
..
PlayerRecord.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
ServerBanDef.cs	Ban message improvements (#14731)	2023-03-18 19:55:12 -05:00
ServerDbBase.cs	Revert "Show ban and note count in ahelp window" (#15347)	2023-04-12 19:43:33 +10:00
ServerDbManager.cs	Revert "Show ban and note count in ahelp window" (#15347)	2023-04-12 19:43:33 +10:00
ServerDbPostgres.cs	Add IP ban exemption flag (#15815)	2023-04-27 11:59:18 -07:00
ServerDbSqlite.cs	Add IP ban exemption flag (#15815)	2023-04-27 11:59:18 -07:00
ServerRoleBanDef.cs	Role bans (#6703)	2022-02-21 23:11:39 +01:00
ServerRoleUnbanDef.cs	Role bans (#6703)	2022-02-21 23:11:39 +01:00
ServerUnbanDef.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
UserDbDataManager.cs	Play time tracking: Job timers 3: more titles: when the (#9978)	2022-08-07 16:00:42 +10:00