Vigers Ray 3ca70f5dc8 Merge remote-tracking branch 'space-wizards/master' ...

# Conflicts:
#	Content.Client/Chat/UI/EmotesMenu.xaml.cs
#	Content.Client/UserInterface/Controls/RadialMenu.cs
#	Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
#	Resources/ServerInfo/Guidebook/Security/Security.xml

2025-04-03 00:33:21 +03:00

0 lines

C#

Raw Permalink Blame History