VigersRay d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/Ghost/Roles/GhostRoleSystem.cs # Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs # Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml # Resources/Textures/Structures/Walls/mining.rsi/meta.json		2024-07-22 04:16:05 +03:00
..
ObjectsTab.xaml	Fix Admin Object tab sorting and search - Part 2 (#28681)	2024-06-28 13:32:57 +10:00
ObjectsTab.xaml.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-22 04:16:05 +03:00
ObjectsTabEntry.xaml	Кнопки удаления и телепорта в панели гридов	2024-06-11 04:52:26 +03:00
ObjectsTabEntry.xaml.cs	Кнопки удаления и телепорта в панели гридов	2024-06-11 04:52:26 +03:00
ObjectsTabHeader.xaml	Кнопки удаления и телепорта в панели гридов	2024-06-11 04:52:26 +03:00
ObjectsTabHeader.xaml.cs	Fix Admin Object tab sorting and search (#28609)	2024-06-06 02:41:11 -04:00