Morb0 6c09b978a3 Merge remote-tracking branch 'wizards/master' into upstream-sync ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Telephone/TelephoneSystem.cs
#	LICENSE.TXT
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Guidebook/rules.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/ServerInfo/Guidebook/Chemicals.xml
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json

2025-01-12 19:59:31 +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-12 19:59:31 +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

Fix race condition causing disconnected admins to appear in adminwho (#34033)

2024-12-24 11:18:31 +11:00

Notes

…

Systems

Merge remote-tracking branch 'wizards/master' into upstream-sync

2025-01-12 19:59:31 +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

…

AdminPermsChangedEventArgs.cs

…

AdminRank.cs

…

BanPanelEui.cs

Integrate Modern HWID into content

2024-11-12 01:51:54 +01:00

ContentNetworkResourceManager.cs

…

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

…

QuickDialogSystem.OpenDialog.cs

…

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