shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3824 from Citadel-Station-13/upstream-merge-32417

Browse Source 
[MIRROR] Fixes EMP wire pulsing
This commit is contained in:
LetterJay
2017-11-07 04:41:55 -06:00
committed by GitHub
parent c102833d2d fd00954241
commit 2d07daca49
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wires/wires.dm
+4 -4
View File
@@ -74,7 +74,7 @@
"white", "white",
"yellow" "yellow"
) )
var/list/my_possible_colors = possible_colors.Copy() var/list/my_possible_colors = possible_colors.Copy()
for(var/wire in shuffle(wires)) for(var/wire in shuffle(wires))
@@ -163,9 +163,9 @@
for(var/wire in possible_wires) for(var/wire in possible_wires)
if(prob(33)) if(prob(33))
pulse(wire) pulse(wire)
remaining_pulses-- remaining_pulses--
if(remaining_pulses >= 0) if(!remaining_pulses)
break break
// Overridable Procs // Overridable Procs
/datum/wires/proc/interactable(mob/user) /datum/wires/proc/interactable(mob/user)