diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 2c06168499e..2fac272afd5 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -143,7 +143,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N sleep(90) H.visible_message("[H]'s body begins to violently stretch and contort.", \ - "You begin to rend apart the final barries to godhood.") + "You begin to rend apart the final barriers to godhood.") sleep(40) to_chat(H, "Yes!") diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index d359744320c..afd677d7d5c 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1370,7 +1370,6 @@ if(!L.isfunctional()) continue if(prob(chance)) - L.on = 1 L.broken() stoplag() diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 1c2a0397b62..5d51ea2eeb9 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -514,17 +514,14 @@ status = LIGHT_EMPTY update() -/obj/machinery/light/proc/broken(skip_sound_and_sparks = 0) - if(status == LIGHT_EMPTY || status == LIGHT_BROKEN) +/obj/machinery/light/proc/broken() + if(status == LIGHT_EMPTY || status == LIGHT_BROKEN || status == LIGHT_BURNED) return - - if(!skip_sound_and_sparks) - if(status == LIGHT_OK || status == LIGHT_BURNED) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - if(on) - var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread - s.set_up(3, 1, src) - s.start() + if(status == LIGHT_OK) + playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) + var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread + s.set_up(3, 1, src) + s.start() status = LIGHT_BROKEN update()