]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fixes Electrocuting grabbed targets while insulated (#22087)
authorTomás Alves <tomasalves35@gmail.com>
Sat, 2 Dec 2023 20:02:17 +0000 (20:02 +0000)
committerGitHub <noreply@github.com>
Sat, 2 Dec 2023 20:02:17 +0000 (15:02 -0500)
Content.Server/Electrocution/ElectrocutionSystem.cs

index 4dc4f198a5aa9b45a5c1cca32b970aa6cab2ec56..c3ae24607445e193ab1a89f420cf54cdc4913f66 100644 (file)
@@ -230,7 +230,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
         _appearance.SetData(uid, ElectrifiedVisuals.IsPowered, true);
 
         siemens *= electrified.SiemensCoefficient;
-        if (siemens <= 0 || !DoCommonElectrocutionAttempt(targetUid, uid, ref siemens))
+        if (!DoCommonElectrocutionAttempt(targetUid, uid, ref siemens) || siemens <= 0)
             return false; // If electrocution would fail, do nothing.
 
         var targets = new List<(EntityUid entity, int depth)>();