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

Fix floodlights not turning off when out of power, and fixes sling veil not working on them #12222

Merged
JamieD1 merged 2 commits into from
Sep 17, 2021
Merged

Fix floodlights not turning off when out of power, and fixes sling veil not working on them #12222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acd5a3c
Fix floodlights not turning off when out of power, and fixes sling ve…
adamsong Sep 1, 2021
0a559d3
Update yogstation/code/modules/antagonists/shadowling/shadowling_abil…
adamsong Sep 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/power/floodlight.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
4 changes: 4 additions & 0 deletions yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down