Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 769bbc6

Browse files
authored
Fix floodlights not turning off when out of power, and fixes sling veil not working on them (#12222)
* Fix floodlights not turning off when out of power, and fixes sling veil not working on them * Update yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm
1 parent 43cd0c2 commit 769bbc6

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

code/modules/power/floodlight.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
if((val < 1) || (val > light_setting_list.len))
6565
return
6666
active_power_usage = light_setting_list[val]
67-
if(!avail(active_power_usage))
67+
if(active_power_usage && !avail(active_power_usage))
6868
return change_setting(val - 1)
6969
setting = val
7070
set_light(light_setting_list[val])

yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@
170170
var/obj/mecha/M = LO
171171
M.set_light(0)
172172
M.lights = FALSE
173+
if(istype(LO, /obj/machinery/power/floodlight))
174+
var/obj/machinery/power/floodlight/FL = LO
175+
FL.change_setting(2) // Set floodlight to lowest setting
176+
173177
for(var/obj/structure/glowshroom/G in orange(7, user)) //High radius because glowshroom spam wrecks shadowlings
174178
if(!istype(G, /obj/structure/glowshroom/shadowshroom))
175179
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!

0 commit comments

Comments
 (0)