Morb0 55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-10-15 17:52:02 +03:00
..
AutoEmoteSystem.cs	Refactor: Chat transmission ranges (+ a little preparation for downstream fork functionality) (#16026)	2023-05-04 12:08:08 -07:00
ChatSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +03:00
ChatSystem.Emote.cs	Fix double-emotes (#19279)	2023-08-18 23:59:23 +10:00
EmoteOnDamageSystem.cs	Refactor: Chat transmission ranges (+ a little preparation for downstream fork functionality) (#16026)	2023-05-04 12:08:08 -07:00