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
..
Roles	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-22 04:16:05 +03:00
GhostComponent.cs	Magic Refactor + Wizard Grimoire (#22568)	2024-05-11 19:06:49 -04:00
GhostHearingComponent.cs	Ghost hearing action (#19722)	2023-09-24 16:34:08 -04:00
GhostRoleRadioEvents.cs	Syndicate Reinforcement Specializations: Medic, Spy, Thief (#29853)	2024-07-21 20:32:25 +10:00
ReturnToBodyEuiMessage.cs	Defibrillator (#15922)	2023-05-03 10:10:19 +10:00
SharedGhostSystem.cs	Turn interaction related attempt events into structs (#29168)	2024-06-19 00:30:41 +10:00