Hotfix babyproof arrivals terminal and arrivals shuttle (#33538)

This commit is contained in:
Errant
2024-11-25 12:12:11 +01:00
committed by GitHub
6 changed files with 5390 additions and 598 deletions

View File

@@ -18,8 +18,11 @@ public sealed partial class CableComponent : Component
[DataField]
public EntProtoId CableDroppedOnCutPrototype = "CableHVStack1";
/// <summary>
/// The tool quality needed to cut the cable. Setting to null prevents cutting.
/// </summary>
[DataField]
public ProtoId<ToolQualityPrototype> CuttingQuality = SharedToolSystem.CutQuality;
public ProtoId<ToolQualityPrototype>? CuttingQuality = SharedToolSystem.CutQuality;
/// <summary>
/// Checked by <see cref="CablePlacerComponent"/> to determine if there is

View File

@@ -35,7 +35,10 @@ public sealed partial class CableSystem : EntitySystem
if (args.Handled)
return;
args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, cable.CuttingDelay, cable.CuttingQuality, new CableCuttingFinishedEvent());
if (cable.CuttingQuality != null)
{
args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, cable.CuttingDelay, cable.CuttingQuality, new CableCuttingFinishedEvent());
}
}
private void OnCableCut(EntityUid uid, CableComponent cable, DoAfterEvent args)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -45,3 +45,11 @@
powerMV:
!type:CableTerminalNode
nodeGroupID: MVPower
- type: entity
id: CableTerminalUncuttable
parent: CableTerminal
suffix: uncuttable
components:
- type: Cable
cuttingQuality: null

View File

@@ -98,6 +98,14 @@
sound:
path: /Audio/Ambience/Objects/emf_buzz.ogg
- type: entity
id: CableHVUncuttable
parent: CableHV
suffix: uncuttable
components:
- type: Cable
cuttingQuality: null
- type: entity
parent: CableBase
id: CableMV
@@ -142,6 +150,14 @@
- type: CableVisualizer
statePrefix: mvcable_
- type: entity
id: CableMVUncuttable
parent: CableMV
suffix: uncuttable
components:
- type: Cable
cuttingQuality: null
- type: entity
parent: CableBase
id: CableApcExtension
@@ -188,3 +204,11 @@
acts: [ "Destruction" ]
- type: CableVisualizer
statePrefix: lvcable_
- type: entity
id: CableApcExtensionUncuttable
parent: CableApcExtension
suffix: uncuttable
components:
- type: Cable
cuttingQuality: null