Morb0 076783b977 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Locale/en-US/chemistry/components/mixing-component.ftl # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/ServerInfo/Guidebook/Mobs/Diona.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Science/Technologies.xml # Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png # Resources/Textures/Tiles/attributions.yml		2024-07-08 13:41:28 +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-06-21 16:32:00 +03:00
ServerDbEntryManager.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
ServerDbManager.cs	Fixes client having authority over rules popup cvars (#28655)	2024-06-07 21:53:20 +02:00
ServerDbPostgres.cs	Implement BlacklistedRange exempt flag (#29258)	2024-06-21 14:06:07 +02:00
ServerDbSqlite.cs	Move checking code for BlacklistedRange to the right place in sqlite (#29389)	2024-07-04 21:02:53 +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