VigersRay 0441b8b814 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Launcher/LauncherConnecting.cs # Content.Client/Launcher/LauncherConnectingGui.xaml # Content.Client/Launcher/LauncherConnectingGui.xaml.cs # Content.Server/Administration/Managers/BanManager.cs # Content.Server/Medical/Components/HealthAnalyzerComponent.cs # Content.Server/Medical/HealthAnalyzerSystem.cs # Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs # Content.Server/StationEvents/Events/RandomSentienceRule.cs # Content.Shared/Interaction/Components/BlockMovementComponent.cs # Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs # Content.Shared/Materials/SharedMaterialReclaimerSystem.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Objectives/objectiveGroups.yml # Resources/Prototypes/Objectives/stealTargetGroups.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Species/human.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml # Resources/migration.yml		2024-08-22 06:50:04 +03:00
..
BaseShuttleControl.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
BaseShuttleControl.xaml.cs	Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)	2024-06-02 14:07:41 +10:00
DockingScreen.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
DockingScreen.xaml.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
DockObject.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
DockObject.xaml.cs	Resolve all non-obsoleting warnings in content (#27934)	2024-05-11 20:13:58 -07:00
EmergencyConsoleWindow.xaml	Minor UI refactor (#11212)	2022-09-11 20:42:12 -07:00
EmergencyConsoleWindow.xaml.cs	Move/Rename stuff (#11209)	2022-09-11 18:56:21 -07:00
IFFConsoleWindow.xaml	Move/Rename stuff (#11209)	2022-09-11 18:56:21 -07:00
IFFConsoleWindow.xaml.cs	Move/Rename stuff (#11209)	2022-09-11 18:56:21 -07:00
MapScreen.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
MapScreen.xaml.cs	Update MapScreen.xaml.cs to not use Component.Owner (#29938)	2024-07-12 19:21:54 +10:00
NavScreen.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
NavScreen.xaml.cs	Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)	2024-06-02 14:07:41 +10:00
RadarConsoleWindow.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
RadarConsoleWindow.xaml.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleConsoleWindow.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleConsoleWindow.xaml.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleDockControl.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleDockControl.xaml.cs	Update ShuttleDockControl.xaml.cs to not use Component.Owner (#29966)	2024-07-13 14:05:31 +10:00
ShuttleMapControl.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleMapControl.xaml.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-14 12:24:06 +03:00
ShuttleNavControl.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleNavControl.xaml.cs	fix and buff the handheld mass scanner (#31284)	2024-08-21 12:33:01 -06:00