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:
@@ -119,6 +119,7 @@ namespace Content.Client.Entry
|
||||
_prototypeManager.RegisterIgnore("wireLayout");
|
||||
_prototypeManager.RegisterIgnore("alertLevels");
|
||||
_prototypeManager.RegisterIgnore("nukeopsRole");
|
||||
_prototypeManager.RegisterIgnore("ghostRoleRaffleDecider");
|
||||
|
||||
_componentFactory.GenerateNetIds();
|
||||
_adminManager.Initialize();
|
||||
|
||||
Reference in New Issue
Block a user