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
..
UI	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-22 04:16:05 +03:00
VendingMachineBoundUserInterface.cs	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
VendingMachineSystem.cs	more component ref removal + combining server/client comps (#13178)	2022-12-25 05:28:21 +01:00