From bd69a59bad07cf393d0a40d44cc8d02919aeb4be Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 5 Nov 2017 13:03:18 -0500 Subject: [PATCH 1/2] Merge pull request #32417 from YPOQ/empwirefix Fixes EMP wire pulsing --- code/datums/wires/wires.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index c508907bf4..19f7157faa 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -74,7 +74,7 @@ "white", "yellow" ) - + var/list/my_possible_colors = possible_colors.Copy() for(var/wire in shuffle(wires)) @@ -163,9 +163,9 @@ for(var/wire in possible_wires) if(prob(33)) pulse(wire) - remaining_pulses-- - if(remaining_pulses >= 0) - break + remaining_pulses-- + if(!remaining_pulses) + break // Overridable Procs /datum/wires/proc/interactable(mob/user)