Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

baby proof the terminal #33281

Merged
merged 7 commits into from
Nov 22, 2024
Merged

baby proof the terminal #33281

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4be8d0
baby proof the terminal
IProduceWidgets Nov 12, 2024
d2d86e4
Make a couple exceptions for items that you might take with you.
IProduceWidgets Nov 12, 2024
59fe0e9
alwayspoweredlights
IProduceWidgets Nov 13, 2024
b6b488f
Uncuttable cables since cablecomp is a snowflake construction system
IProduceWidgets Nov 13, 2024
74f5dfd
chairs and vendors
IProduceWidgets Nov 14, 2024
d39c237
rerun heisentests
IProduceWidgets Nov 14, 2024
4d73b78
rerun tests again
IProduceWidgets Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Content.Server/Power/Components/CableComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion Content.Server/Power/EntitySystems/CableSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ private void OnInteractUsing(EntityUid uid, CableComponent cable, InteractUsingE
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)
Expand Down
Loading
Loading