faint 076d2e339b Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.Client/Administration/UI/AdminMenuWindow.xaml.cs # Content.Client/LateJoin/LateJoinGui.cs # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png # Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png # RobustToolbox		2023-07-10 07:03:24 +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 'wizards/master' into upstream-sync	2023-07-10 07:03:24 +03:00
ChatChannel.cs	Misc replay related changes (#17102)	2023-06-05 14:33:49 +10: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	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-07-04 03:14:11 +03:00