Morb0 38506f90df Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Clothing/Hands/specific.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml		2024-04-27 13:24:36 +03:00
..
Tabs	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-27 13:24:36 +03:00
EscapeMenu.xaml	Guidebook Revival (#13320)	2023-01-16 02:42:22 -06:00
EscapeMenu.xaml.cs	Merge more UI refactor stuff (#11277)	2022-09-14 14:34:48 -07:00
OptionsMenu.xaml	Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430)	2023-12-12 17:58:20 -08:00
OptionsMenu.xaml.cs	Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430)	2023-12-12 17:58:20 -08:00