Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-08-05-2024-upstream

# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/lobbyscreens.yml
This commit is contained in:
Ed
2024-05-08 12:26:05 +03:00
585 changed files with 5719 additions and 3832 deletions

View File

@@ -119,6 +119,7 @@ namespace Content.Client.Entry
_prototypeManager.RegisterIgnore("wireLayout");
_prototypeManager.RegisterIgnore("alertLevels");
_prototypeManager.RegisterIgnore("nukeopsRole");
_prototypeManager.RegisterIgnore("ghostRoleRaffleDecider");
_componentFactory.GenerateNetIds();
_adminManager.Initialize();