Nerf airlock deconstruction (#6343)
This commit is contained in:
@@ -61,7 +61,7 @@ namespace Content.Server.Construction
|
||||
if (attempt.Cancelled)
|
||||
return false;
|
||||
|
||||
return await _toolSystem.UseTool(usingUid, userUid, uid, 0f, 0.5f + attempt.Delay, anchorable.Tool, toolComponent:usingTool);
|
||||
return await _toolSystem.UseTool(usingUid, userUid, uid, 0f, anchorable.Delay + attempt.Delay, anchorable.Tool, toolComponent:usingTool);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Tools;
|
||||
using Robust.Shared.Analyzers;
|
||||
using Robust.Shared.GameObjects;
|
||||
@@ -8,7 +7,6 @@ using Robust.Shared.ViewVariables;
|
||||
|
||||
namespace Content.Server.Construction.Components
|
||||
{
|
||||
// TODO: Move this component's logic to an EntitySystem.
|
||||
[RegisterComponent, Friend(typeof(AnchorableSystem))]
|
||||
public class AnchorableComponent : Component
|
||||
{
|
||||
@@ -18,6 +16,13 @@ namespace Content.Server.Construction.Components
|
||||
[DataField("snap")]
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
public bool Snap { get; private set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Base delay to use for anchoring.
|
||||
/// </summary>
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
[DataField("delay")]
|
||||
public float Delay = 0.5f;
|
||||
}
|
||||
|
||||
public abstract class BaseAnchoredAttemptEvent : CancellableEntityEventArgs
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
- MobImpassable
|
||||
- VaultImpassable
|
||||
- type: Anchorable
|
||||
delay: 2
|
||||
- type: Pullable
|
||||
- type: Transform
|
||||
anchored: true
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
components:
|
||||
- type: InteractionOutline
|
||||
- type: Anchorable
|
||||
delay: 2
|
||||
- type: Physics
|
||||
bodyType: Static
|
||||
- type: Fixtures
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
steps:
|
||||
- material: Cable
|
||||
amount: 5
|
||||
doAfter: 1
|
||||
doAfter: 2.5
|
||||
- to: start
|
||||
conditions:
|
||||
- !type:EntityAnchored
|
||||
@@ -39,7 +39,7 @@
|
||||
- !type:DeleteEntity {}
|
||||
steps:
|
||||
- tool: Welding
|
||||
doAfter: 2
|
||||
doAfter: 3
|
||||
|
||||
- node: wired
|
||||
entity: AirlockAssembly
|
||||
@@ -54,7 +54,7 @@
|
||||
icon:
|
||||
sprite: "Objects/Misc/module.rsi"
|
||||
state: "door_electronics"
|
||||
doAfter: 1
|
||||
doAfter: 3
|
||||
- to: assembly
|
||||
completed:
|
||||
- !type:SpawnPrototype
|
||||
@@ -62,7 +62,7 @@
|
||||
amount: 5
|
||||
steps:
|
||||
- tool: Cutting
|
||||
doAfter: 1
|
||||
doAfter: 2.5
|
||||
|
||||
- node: electronics
|
||||
edges:
|
||||
@@ -71,7 +71,7 @@
|
||||
- !type:EntityAnchored {}
|
||||
steps:
|
||||
- tool: Screwing
|
||||
doAfter: 2
|
||||
doAfter: 2.5
|
||||
|
||||
- node: airlock
|
||||
entity: Airlock
|
||||
@@ -89,7 +89,7 @@
|
||||
- !type:EmptyAllContainers {}
|
||||
steps:
|
||||
- tool: Prying
|
||||
doAfter: 1
|
||||
doAfter: 5
|
||||
- to: wired # TODO ShadowCommander: Remove when board spawning is implemented in ServerDoorComponent.cs. Needs a map update.
|
||||
conditions:
|
||||
- !type:EntityAnchored {}
|
||||
@@ -104,4 +104,4 @@
|
||||
prototype: DoorElectronics
|
||||
steps:
|
||||
- tool: Prying
|
||||
doAfter: 1
|
||||
doAfter: 5
|
||||
|
||||
Reference in New Issue
Block a user