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
ConstructionGhostComponent.cs	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
ConstructionPlacementHijack.cs	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
ConstructionSystem.cs	Remove all Assigned Values that are Never Used (#30110)	2024-07-18 20:22:23 -04:00
FlatpackSystem.cs	Flatpacks and the Flatpacker 1001 (#23338)	2024-01-03 17:16:02 +11:00