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

Merge branch 'master' into 2020-04-28-tool-component

Browse Source 
# Conflicts:
#	Content.Server/GameObjects/Components/AnchorableComponent.cs
#	Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
#	Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
#	Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs
#	Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs
#	Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
#	Content.Server/GameObjects/Components/WiresComponent.cs
This commit is contained in:
zumorica
2020-05-23 18:00:28 +02:00
parent 154ff47446 3847b5260b
commit 934e69d6e3
47 changed files with 312 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
View File

@@ -27,7 +27,7 @@ using Robust.Shared.Utility;
namespace Content.Server.GameObjects.Components.Construction
{
[RegisterComponent]
public class ConstructionComponent : Component, IAttackBy
public class ConstructionComponent : Component, IInteractUsing
{
public override string Name => "Construction";
@@ -53,7 +53,7 @@ namespace Content.Server.GameObjects.Components.Construction
Transform = Owner.GetComponent<ITransformComponent>();
}
public bool AttackBy(AttackByEventArgs eventArgs)
public bool InteractUsing(InteractUsingEventArgs eventArgs)
{
// default interaction check for AttackBy allows inside blockers, so we will check if its blocked if
// we're not allowed to build on impassable stuff
@@ -65,7 +65,7 @@ namespace Content.Server.GameObjects.Components.Construction
var stage = Prototype.Stages[Stage];
if (TryProcessStep(stage.Forward, eventArgs.AttackWith, eventArgs.User))
if (TryProcessStep(stage.Forward, eventArgs.Using, eventArgs.User))
{
Stage++;
if (Stage == Prototype.Stages.Count - 1)
@@ -85,7 +85,7 @@ namespace Content.Server.GameObjects.Components.Construction
}
}
else if (TryProcessStep(stage.Backward, eventArgs.AttackWith, eventArgs.User))
else if (TryProcessStep(stage.Backward, eventArgs.Using, eventArgs.User))
{
Stage--;
if (Stage == 0)