Morb0 caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/wrench.rsi/meta.json		2023-12-08 13:54:31 +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 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +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