VigersRay bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/LobbyUIController.cs # Resources/Locale/en-US/chemistry/components/mixing-component.ftl # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Recipes/Crafting/crates.yml # Resources/ServerInfo/Guidebook/Mobs/Diona.xml # Resources/ServerInfo/Guidebook/Mobs/Species.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Science/Technologies.xml # Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png # Resources/Textures/Tiles/attributions.yml # Resources/migration.yml		2024-07-11 14:05:37 +03:00
..
Prototypes	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
TypingIndicator	Fix typing indicators! (#29492)	2024-07-10 15:51:47 +10:00
V2	Chatfactor: Chat Repository, Admin Commands, Chat Created Events (#26113)	2024-04-18 14:59:10 +10:00
ChatChannel.cs	News UI overhaul and PDA notifications (#19610)	2024-02-26 21:38:00 -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
EmotesEvents.cs	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
MsgChatMessage.cs	Make chat & examine systems use FormattedMessage.EscapeText() (#28431)	2024-05-31 16:05:34 -04:00
MsgDeleteChatMessagesBy.cs	Add admin Erase verb, add checkbox to erase from the ban panel (#20985)	2023-10-14 02:02:56 -07:00
SharedChatSystem.cs	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00