Morb0 38506f90df Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Clothing/Hands/specific.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml		2024-04-27 13:24:36 +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	Add option for admins to disable bwoink (#25008)	2024-02-20 23:52:03 -07:00
UI	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
AdminNameOverlay.cs	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
QuickDialogSystem.cs	make dialog window not evil (#24677)	2024-02-01 23:56:40 +11:00