Morb0 da4af61aee Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs # Resources/Prototypes/GameRules/events.yml # Resources/Textures/Objects/Devices/nuke.rsi/meta.json		2024-06-15 10:39:49 +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-06-15 10:39:49 +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