Morb0 996b761d80 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.Packaging/ClientPackaging.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json		2025-01-16 13:37:26 +03:00
..
BanList	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00
Commands	Merge remote-tracking branch 'wizards/master' into upstream-sync	2025-01-16 13:37:26 +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	Add Discord webhook on watchlist connection (#33483)	2025-01-15 01:32:24 +01:00
Notes	Improve admin message seen/dismiss state. (#26223)	2024-03-21 16:15:46 +01:00
Systems	Merge remote-tracking branch 'wizards/master' into upstream-sync	2025-01-16 13:37:26 +03:00
Toolshed	Toolshed refactor (#33598)	2024-12-21 17:45:48 +11:00
UI	Persist deadmin to database, add admin suspension system (#34048)	2025-01-15 00:46:45 +01: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	Integrate Modern HWID into content	2024-11-12 01:51:54 +01: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