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

Merge remote-tracking branch 'upstream/master' into 20-10-30-admins

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-10 16:59:17 +01:00
parent e39ddd4802 e567e9fec1
commit 00774e90ed
473 changed files with 5588 additions and 3584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/ClientContentIoC.cs
View File

@@ -13,6 +13,7 @@ using Content.Client.UserInterface.AdminMenu;
using Content.Client.UserInterface.Stylesheets;
using Content.Client.Utility;
using Content.Shared.Interfaces;
using Content.Shared.Alert;
using Robust.Shared.IoC;
namespace Content.Client
@@ -37,6 +38,7 @@ namespace Content.Client
IoCManager.Register<IClickMapManager, ClickMapManager>();
IoCManager.Register<IStationEventManager, StationEventManager>();
IoCManager.Register<IAdminMenuManager, AdminMenuManager>();
IoCManager.Register<AlertManager, AlertManager>();
IoCManager.Register<IClientAdminManager, ClientAdminManager>();
IoCManager.Register<EuiManager, EuiManager>();
}