VigersRay ff29e78e72 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Client/Chat/Managers/ChatManager.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Ghost/Roles/GhostRoleSystem.cs # Content.Server/Zombies/ZombieSystem.Transform.cs # Content.Shared/Administration/PlayerInfo.cs		2024-08-15 22:54:40 +03:00
..
base_objectives.yml	make objectives use entityCategory (#28269)	2024-06-03 09:23:52 -04:00
changeling.yml	Говнокрад (#268)	2024-08-08 09:28:44 +03:00
dragon.yml	Character menu issuer localization (#29840)	2024-07-17 08:47:50 +03:00
ninja.yml	Character menu issuer localization (#29840)	2024-07-17 08:47:50 +03:00
objectiveGroups.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-15 22:54:40 +03:00
stealTargetGroups.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-15 22:54:40 +03:00
thief.yml	Golden toilet (#31049)	2024-08-15 13:23:59 -06:00
traitor.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-14 19:55:44 +03:00