Morb0 37dc87ad6f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/MassMedia/Ui/NewsWriteBoundUserInterface.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/MassMedia/Systems/NewsSystem.cs # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png # Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json # Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png # Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png # Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png # SpaceStation14.sln # Tools/actions_changelogs_since_last_run.py # Tools/package_client_build.py # Tools/package_server_build.py		2024-01-15 01:56:14 +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 upstream-sync	2024-01-15 01:56:14 +03:00
AdminNameOverlay.cs	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
QuickDialogSystem.cs	Quick dialog fixes (#24046)	2024-01-14 14:18:02 +11:00