diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index d1d01cae33..f42c2d27fb 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -1,3 +1,4 @@ +using Content.Client._Sunrise.Entry; using Content.Client._Sunrise.ServersHub; using Content.Client.Administration.Managers; using Content.Client.Changelog; @@ -25,6 +26,8 @@ using Content.Client.Voting; using Content.Shared.Ame.Components; using Content.Shared.Gravity; using Content.Shared.Localizations; +using Content.Sunrise.Interfaces.Client; +using Content.Sunrise.Interfaces.Shared; using Robust.Client; using Robust.Client.Graphics; using Robust.Client.Input; @@ -141,6 +144,10 @@ namespace Content.Client.Entry _serversHubManager.Initialize(); // Sunrise-Hub + // Sunrise-Sponsors-Start + SunriseClientEntry.Init(); + // Sunrise-Sponsors-End + //AUTOSCALING default Setup! _configManager.SetCVar("interface.resolutionAutoScaleUpperCutoffX", 1080); _configManager.SetCVar("interface.resolutionAutoScaleUpperCutoffY", 720); @@ -177,6 +184,10 @@ namespace Content.Client.Entry _documentParsingManager.Initialize(); _titleWindowManager.Initialize(); + // Sunrise-Sponsors-Start + SunriseClientEntry.PostInit(); + // Sunrise-Sponsors-End + _baseClient.RunLevelChanged += (_, args) => { if (args.NewLevel == ClientRunLevel.Initialize) diff --git a/Content.Client/_Sunrise/Entry/SunriseClientEntry.cs b/Content.Client/_Sunrise/Entry/SunriseClientEntry.cs new file mode 100644 index 0000000000..bcae00a003 --- /dev/null +++ b/Content.Client/_Sunrise/Entry/SunriseClientEntry.cs @@ -0,0 +1,12 @@ +namespace Content.Client._Sunrise.Entry; + +public sealed class SunriseClientEntry +{ + public static void Init() + { + } + + public static void PostInit() + { + } +} diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs index 7e77d23c70..fad0dfcda3 100644 --- a/Content.Server/Entry/EntryPoint.cs +++ b/Content.Server/Entry/EntryPoint.cs @@ -1,3 +1,4 @@ +using Content.Server._Sunrise.Entry; using Content.Server._Sunrise.GuideGenerator; using Content.Server._Sunrise.ServersHub; using Content.Server._Sunrise.TTS; @@ -29,6 +30,8 @@ using Content.Server.Voting.Managers; using Content.Shared.CCVar; using Content.Shared.Kitchen; using Content.Shared.Localizations; +using Content.Sunrise.Interfaces.Server; +using Content.Sunrise.Interfaces.Shared; using Robust.Server; using Robust.Server.ServerStatus; using Robust.Shared.Configuration; @@ -119,6 +122,10 @@ namespace Content.Server.Entry IoCManager.Resolve().Initialize(); // Sunrise-Hub + // Sunrise-Sponsors-Start + SunriseServerEntry.Init(); + // Sunrise-Sponsors-End + _voteManager.Initialize(); _updateManager.Initialize(); _playTimeTracking.Initialize(); @@ -172,6 +179,9 @@ namespace Content.Server.Entry IoCManager.Resolve().Initialize(); IoCManager.Resolve().PostInit(); IoCManager.Resolve().Initialize(); + // Sunrise-Sponsors-Start + SunriseServerEntry.PostInit(); + // Sunrise-Sponsors-End } } diff --git a/Content.Server/_Sunrise/Entry/SunriseServerEntry.cs b/Content.Server/_Sunrise/Entry/SunriseServerEntry.cs new file mode 100644 index 0000000000..0778dc94ed --- /dev/null +++ b/Content.Server/_Sunrise/Entry/SunriseServerEntry.cs @@ -0,0 +1,15 @@ +using Content.Sunrise.Interfaces.Server; +using Content.Sunrise.Interfaces.Shared; + +namespace Content.Server._Sunrise.Entry; + +public sealed class SunriseServerEntry +{ + public static void Init() + { + } + + public static void PostInit() + { + } +} diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/tapes.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/base_tape.yml similarity index 99% rename from Resources/Prototypes/_Sunrise/Entities/Objects/Specific/tapes.yml rename to Resources/Prototypes/_Sunrise/Entities/Objects/Specific/base_tape.yml index 485d30eb70..4e275616a7 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/tapes.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/base_tape.yml @@ -1,3 +1,4 @@ + - type: entity parent: BaseItem id: BaseMusicTape