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
..
AnnounceOnSpawnSystem.cs	nar'sie fake (#20299)	2023-12-06 20:24:33 -05:00
AutoEmoteSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
ChatSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-15 01:56:14 +03:00
ChatSystem.Emote.cs	Use ECS prototype-reload events (#22613)	2023-12-23 01:13:45 +11:00
EmoteOnDamageSystem.cs	Refactor: Chat transmission ranges (+ a little preparation for downstream fork functionality) (#16026)	2023-05-04 12:08:08 -07:00