tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '20-10-30-admins' into 20-11-13-merges

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-13 01:29:08 +01:00
parent 9e36ef2202 f8f177f43a
commit 5ff8aa7fb1
91 changed files with 6248 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/EntryPoint.cs
View File

@@ -1,4 +1,6 @@
using System;
using Content.Client.Administration;
using Content.Client.Eui;
using Content.Client.GameObjects.Components.Actor;
using Content.Client.Input;
using Content.Client.Interfaces;
@@ -88,6 +90,7 @@ namespace Content.Client
IoCManager.BuildGraph();
IoCManager.Resolve<IClientAdminManager>().Initialize();
IoCManager.Resolve<IParallaxManager>().LoadParallax();
IoCManager.Resolve<IBaseClient>().PlayerJoinedServer += SubscribePlayerAttachmentEvents;
IoCManager.Resolve<IStylesheetManager>().Initialize();
@@ -150,6 +153,7 @@ namespace Content.Client
IoCManager.Resolve<IClientPreferencesManager>().Initialize();
IoCManager.Resolve<IStationEventManager>().Initialize();
IoCManager.Resolve<IAdminMenuManager>().Initialize();
IoCManager.Resolve<EuiManager>().Initialize();
IoCManager.Resolve<AlertManager>().Initialize();
_baseClient.RunLevelChanged += (sender, args) =>