Morb0 611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors ... # Conflicts: # .github/workflows/publish.yml # Content.Packaging/ContentPackaging.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Resources/Audio/Weapons/Guns/Gunshots/license.txt # Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png		2023-11-08 03:00:51 +03:00
..
Components	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Managers	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Systems	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
UI	Merge remote-tracking branch 'upstream/master' into update-sposnors	2023-11-08 03:00:51 +03:00
AdminNameOverlay.cs	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
QuickDialogSystem.cs	Move/Rename stuff (#11209)	2022-09-11 18:56:21 -07:00