Morb0 a0bce916fb Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Guidebook/rules.yml # Resources/Prototypes/Maps/cluster.yml # Resources/Prototypes/Maps/europa.yml # Resources/Prototypes/Maps/origin.yml		2024-08-16 14:29:08 +03:00
..
Components	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Managers	Hide some map related logs from clients (#27127)	2024-04-19 15:26:21 +10:00
Systems	Prevent admin-frozen players from ghosting or suiciding, add "Freeze And Mute" verb (#27813)	2024-05-12 10:35:30 -04:00
UI	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-08-16 14:29:08 +03:00
AdminNameOverlay.cs	Namespace cleanup around Mind Roles (#30965)	2024-08-15 20:26:57 +02:00
QuickDialogSystem.cs	make dialog window not evil (#24677)	2024-02-01 23:56:40 +11:00