diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm index 05e33472157c..675c2eb19712 100644 --- a/code/modules/power/floodlight.dm +++ b/code/modules/power/floodlight.dm @@ -64,7 +64,7 @@ if((val < 1) || (val > light_setting_list.len)) return active_power_usage = light_setting_list[val] - if(!avail(active_power_usage)) + if(active_power_usage && !avail(active_power_usage)) return change_setting(val - 1) setting = val set_light(light_setting_list[val]) diff --git a/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm index 4ced4b43e4cd..6fb4583c0479 100644 --- a/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm +++ b/yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm @@ -170,6 +170,10 @@ var/obj/mecha/M = LO M.set_light(0) M.lights = FALSE + if(istype(LO, /obj/machinery/power/floodlight)) + var/obj/machinery/power/floodlight/FL = LO + FL.change_setting(2) // Set floodlight to lowest setting + for(var/obj/structure/glowshroom/G in orange(7, user)) //High radius because glowshroom spam wrecks shadowlings if(!istype(G, /obj/structure/glowshroom/shadowshroom)) var/obj/structure/glowshroom/shadowshroom/S = new /obj/structure/glowshroom/shadowshroom(G.loc) //I CAN FEEL THE WARP OVERTAKING ME! IT IS A GOOD PAIN!