Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Updates the content components to be compatible with the changes in 55a50ff7ba.

Browse Source 
Updates engine submodule.
This commit is contained in:
Acruid
2019-09-18 11:29:12 -07:00
parent 364279e0f7
commit dd06c71735
13 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/GameObjects/Components/Power/PowerDevice.cs
View File

@@ -21,7 +21,7 @@ namespace Content.Server.GameObjects.Components.Power
{
public override string Name => "PowerDevice";
public override void Startup()
protected override void Startup()
{
base.Startup();
if (_drawType != DrawTypes.Node)
@@ -161,7 +161,8 @@ namespace Content.Server.GameObjects.Components.Power
}
}
public override void Shutdown()
/// <inheritdoc />
protected override void Shutdown()
{
if (Owner.TryGetComponent(out PowerNodeComponent node))
{

3
Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs
View File

@@ -97,7 +97,8 @@ namespace Content.Server.GameObjects.Components.Power
Load = 0;
}
public override void Shutdown()
/// <inheritdoc />
protected override void Shutdown()
{
base.Shutdown();

5
Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Research;
using Robust.Server.GameObjects.Components.UserInterface;
using Robust.Server.Interfaces.GameObjects;
@@ -99,7 +99,8 @@ namespace Content.Server.GameObjects.Components.Research
}
}
public override void Shutdown()
/// <inheritdoc />
protected override void Shutdown()
{
base.Shutdown();
UnregisterFromServer();

5
Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs
View File

@@ -1,4 +1,4 @@
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using System.Runtime.InteropServices.WindowsRuntime;
using Content.Server.GameObjects.EntitySystems;
@@ -71,7 +71,8 @@ namespace Content.Server.GameObjects.Components.Research
Database = Owner.GetComponent<TechnologyDatabaseComponent>();
}
public override void Shutdown()
/// <inheritdoc />
protected override void Shutdown()
{
base.Shutdown();
IoCManager.Resolve<IEntitySystemManager>()?.GetEntitySystem<ResearchSystem>()?.UnregisterServer(this);

5
Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Content.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
@@ -65,7 +65,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
_appearance = Owner.GetComponent<AppearanceComponent>();
}
public override void Startup()
/// <inheritdoc />
protected override void Startup()
{
base.Startup();

5
Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Weapons.Ranged;
@@ -58,7 +58,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
_appearance = Owner.GetComponent<AppearanceComponent>();
}
public override void Startup()
/// <inheritdoc />
protected override void Startup()
{
base.Startup();

3
Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs
View File

@@ -84,7 +84,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
_appearance = Owner.GetComponent<AppearanceComponent>();
}
public override void Startup()
/// <inheritdoc />
protected override void Startup()
{
base.Startup();