Morb0 06e45fbb4d Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json # Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-left.png # Resources/Textures/Objects/Tools/jaws_of_life.rsi/syn_inhand-right.png		2024-01-27 22:15:20 +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-27 22:15:20 +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