From 207dacd1f285b0a2e1f63747e168d46cba50e4d6 Mon Sep 17 00:00:00 2001 From: mirrorcult Date: Wed, 1 Dec 2021 20:03:38 -0700 Subject: [PATCH] Nerf electrocution (#5651) --- Content.Server/Electrocution/Components/ElectrifiedComponent.cs | 2 +- Resources/Prototypes/Entities/Structures/Power/cables.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs index c34a5e4d19..1c10308613 100644 --- a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs +++ b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs @@ -57,7 +57,7 @@ namespace Content.Server.Electrocution /// Shock time, in seconds. /// [DataField("shockTime")] - public float ShockTime { get; } = 30f; + public float ShockTime { get; } = 8f; [DataField("siemensCoefficient")] public float SiemensCoefficient { get; } = 1f; diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index b04421f07d..55bd5eea9f 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -32,6 +32,7 @@ acts: ["Destruction"] - type: SubFloorHide - type: Electrified + onHandInteract: false onBump: false requirePower: true highVoltageNode: power