Merge pull request #6120 from TullyBurnalot/OverOverload

Multiple Ascendant Light Fix
This commit is contained in:
Fox McCloud
2017-01-15 12:44:47 -05:00
committed by GitHub
3 changed files with 4 additions and 5 deletions
+1 -2
View File
@@ -1368,8 +1368,7 @@
spawn(0)
for(var/obj/machinery/light/L in area)
if(prob(chance))
L.on = 1
L.broken()
L.broken(0, 1)
stoplag()
/obj/machinery/power/apc/proc/setsubsystem(val)
+2 -2
View File
@@ -514,14 +514,14 @@
status = LIGHT_EMPTY
update()
/obj/machinery/light/proc/broken(skip_sound_and_sparks = 0)
/obj/machinery/light/proc/broken(skip_sound_and_sparks = 0, overloaded = 0)
if(status == LIGHT_EMPTY || status == LIGHT_BROKEN)
return
if(!skip_sound_and_sparks)
if(status == LIGHT_OK || status == LIGHT_BURNED)
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
if(on)
if(on || overloaded)
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()