CatStation/Content.Shared/Chat
Morbo c58729755f Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
#	Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
2023-03-24 05:48:43 +03:00
..
Prototypes Add AutoEmote comp/system, updates to zombie code (#13932) 2023-03-02 11:23:56 -08:00
TypingIndicator Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-22 00:07:21 +03:00
ChatChannel.cs Add admin alerts (#13589) 2023-03-23 11:10:49 -04:00
ChatChannelExtensions.cs Add admin alerts (#13589) 2023-03-23 11:10:49 -04:00
ChatSelectChannel.cs Modify admin chat (#13050) 2022-12-19 21:39:01 -06:00
MsgChatMessage.cs Modify admin chat (#13050) 2022-12-19 21:39:01 -06:00
SharedChatSystem.cs Changed emote chat prefix (#850) 2023-03-02 09:36:41 -08:00