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
..
Components	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-11 14:05:37 +03:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-22 04:16:05 +03:00
AccessGroupPrototype.cs	Add door electronics access configuration menu (#17778)	2024-04-01 17:06:13 +11:00
AccessLevelPrototype.cs	Add door electronics access configuration menu (#17778)	2024-04-01 17:06:13 +11:00
SharedAccessWire.cs	Wires refactor (#7699)	2022-05-06 12:35:06 +10:00
SharedAgentIDCardSystem.cs	Cleans up StatusIconSystem and fixing some bugs (#28270)	2024-06-03 12:12:21 -04:00