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
..
BUI	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
Commands	Evac shuttle (#8931)	2022-06-26 15:20:45 +10:00
Systems	Replace obsolete xform.ToMap() with xformSystem.ToMapCoordinates() (#30010)	2024-07-13 23:05:22 +02:00
UI	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-14 12:24:06 +03:00
FtlArrivalOverlay.cs	Add FTL arrival visuals (#29402)	2024-07-01 16:11:30 +10:00
ShuttleConsoleComponent.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ThrusterComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
ThrusterSystem.cs	Resolves ThrusterVisualizer is Obsolete (#13904)	2023-05-07 23:37:28 +10:00