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
..
Commands	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Managers	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-26 01:14:50 +03:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-27 22:15:20 +03:00
TypingIndicator	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-14 16:35:33 +03:00
AnnounceOnSpawnComponent.cs	nar'sie fake (#20299)	2023-12-06 20:24:33 -05:00
AutoEmoteComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
ChatUser.cs	Fix erase verb not removing chat messages in some cases (#21355)	2023-11-05 19:19:59 -07:00
EmoteOnDamageComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
SuicideSystem.cs	Kill SharedEntityExtensions and all popup extensions (#20909)	2023-10-16 16:56:09 +11:00