Vigers Ray 0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/workflows/build-test-debug.yml # Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Nutrition/EntitySystems/HungerSystem.cs # Resources/Locale/en-US/_strings/atmos/gases.ftl # Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl # Resources/Locale/en-US/_strings/tools/components/tool-component.ftl # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Research/industrial.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/ai_factions.yml # Resources/toolshedEngineCommandPerms.yml		2024-12-21 18:51:37 +03:00
..
BanList	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00
Commands	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-26 17:50:59 +03:00
Components	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Logs	Fix admin logs cache caching rounds forever if multiple game servers are ran on the same db (#30687)	2024-08-05 16:13:27 -07:00
Managers	фиксы апстрима	2024-11-26 18:01:48 +03:00
Notes	Improve admin message seen/dismiss state. (#26223)	2024-03-21 16:15:46 +01:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +03:00
Toolshed	Toolshed refactor (#33598)	2024-12-21 17:45:48 +11:00
UI	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00
AdminCommandAttribute.cs	Toolshed (#17895)	2023-08-02 16:09:08 -05:00
AdminPermsChangedEventArgs.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
AdminRank.cs	Remove redundant #nullable enable (#4275)	2021-07-16 17:37:09 -07:00
BanPanelEui.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-26 17:50:59 +03:00
ContentNetworkResourceManager.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
PlayerLocator.cs	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00
PlayerPanelEui.cs	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00
QuickDialogSystem.cs	Obsolete refactor - ConnectedClient to Channel (#24409)	2024-01-23 09:14:13 +11:00
QuickDialogSystem.OpenDialog.cs	Obsolete refactor - ConnectedClient to Channel (#24409)	2024-01-23 09:14:13 +11:00
ServerApi.cs	Panic Bunker uses minutes not hours (#28805)	2024-06-09 22:45:47 +02:00
ServerApi.Utility.cs	Game server admin API (#26880)	2024-04-14 20:13:29 +10:00