baby proof the terminal (#33281)
* baby proof the terminal * Make a couple exceptions for items that you might take with you. * alwayspoweredlights * Uncuttable cables since cablecomp is a snowflake construction system * chairs and vendors * rerun heisentests * rerun tests again
This commit is contained in:
@@ -18,8 +18,11 @@ public sealed partial class CableComponent : Component
|
|||||||
[DataField]
|
[DataField]
|
||||||
public EntProtoId CableDroppedOnCutPrototype = "CableHVStack1";
|
public EntProtoId CableDroppedOnCutPrototype = "CableHVStack1";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The tool quality needed to cut the cable. Setting to null prevents cutting.
|
||||||
|
/// </summary>
|
||||||
[DataField]
|
[DataField]
|
||||||
public ProtoId<ToolQualityPrototype> CuttingQuality = SharedToolSystem.CutQuality;
|
public ProtoId<ToolQualityPrototype>? CuttingQuality = SharedToolSystem.CutQuality;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Checked by <see cref="CablePlacerComponent"/> to determine if there is
|
/// Checked by <see cref="CablePlacerComponent"/> to determine if there is
|
||||||
|
|||||||
@@ -35,8 +35,11 @@ public sealed partial class CableSystem : EntitySystem
|
|||||||
if (args.Handled)
|
if (args.Handled)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (cable.CuttingQuality != null)
|
||||||
|
{
|
||||||
args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, cable.CuttingDelay, cable.CuttingQuality, new CableCuttingFinishedEvent());
|
args.Handled = _toolSystem.UseTool(args.Used, args.User, uid, cable.CuttingDelay, cable.CuttingQuality, new CableCuttingFinishedEvent());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void OnCableCut(EntityUid uid, CableComponent cable, DoAfterEvent args)
|
private void OnCableCut(EntityUid uid, CableComponent cable, DoAfterEvent args)
|
||||||
{
|
{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -45,3 +45,11 @@
|
|||||||
powerMV:
|
powerMV:
|
||||||
!type:CableTerminalNode
|
!type:CableTerminalNode
|
||||||
nodeGroupID: MVPower
|
nodeGroupID: MVPower
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
id: CableTerminalUncuttable
|
||||||
|
parent: CableTerminal
|
||||||
|
suffix: uncuttable
|
||||||
|
components:
|
||||||
|
- type: Cable
|
||||||
|
cuttingQuality: null
|
||||||
@@ -98,6 +98,14 @@
|
|||||||
sound:
|
sound:
|
||||||
path: /Audio/Ambience/Objects/emf_buzz.ogg
|
path: /Audio/Ambience/Objects/emf_buzz.ogg
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
id: CableHVUncuttable
|
||||||
|
parent: CableHV
|
||||||
|
suffix: uncuttable
|
||||||
|
components:
|
||||||
|
- type: Cable
|
||||||
|
cuttingQuality: null
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CableBase
|
parent: CableBase
|
||||||
id: CableMV
|
id: CableMV
|
||||||
@@ -142,6 +150,14 @@
|
|||||||
- type: CableVisualizer
|
- type: CableVisualizer
|
||||||
statePrefix: mvcable_
|
statePrefix: mvcable_
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
id: CableMVUncuttable
|
||||||
|
parent: CableMV
|
||||||
|
suffix: uncuttable
|
||||||
|
components:
|
||||||
|
- type: Cable
|
||||||
|
cuttingQuality: null
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CableBase
|
parent: CableBase
|
||||||
id: CableApcExtension
|
id: CableApcExtension
|
||||||
@@ -188,3 +204,11 @@
|
|||||||
acts: [ "Destruction" ]
|
acts: [ "Destruction" ]
|
||||||
- type: CableVisualizer
|
- type: CableVisualizer
|
||||||
statePrefix: lvcable_
|
statePrefix: lvcable_
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
id: CableApcExtensionUncuttable
|
||||||
|
parent: CableApcExtension
|
||||||
|
suffix: uncuttable
|
||||||
|
components:
|
||||||
|
- type: Cable
|
||||||
|
cuttingQuality: null
|
||||||
|
|||||||
Reference in New Issue
Block a user