Morb0 f062cbcec2 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Systems/ChatSystem.cs # LICENSE.TXT # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Species/reptilian.yml # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png # Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png # Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json # Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing.png # Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png # Resources/Textures/Structures/Piping/disposal.rsi/meta.json		2024-01-02 23:07:58 +03:00
..
Commands	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Managers	Remove lol emote chat sanitize (#1630)	2023-12-12 11:29:37 +03:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-02 23:07:58 +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