Skip to content

Commit

Permalink
nightfall extuinguishes active flares
Browse files Browse the repository at this point in the history
  • Loading branch information
Helg2 committed Jul 13, 2024
1 parent 361aca6 commit 00efc22
Showing 1 changed file with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
/datum/action/ability/activable/xeno/nightfall
name = "Nightfall"
action_icon_state = "nightfall"
desc = "Shut down all electrical lights nearby for 10 seconds."
desc = "Shut down electrical lights for 10 seconds and extinguish flares in nearby range."
cooldown_duration = 45 SECONDS
ability_cost = 100
ability_cost = 150
keybinding_signals = list(
KEYBINDING_NORMAL = COMSIG_XENOABILITY_NIGHTFALL,
)
Expand All @@ -28,7 +28,10 @@
if(isnull(light.loc) || (owner.loc.z != light.loc.z) || (get_dist(owner, light) >= range))
continue
light.turn_light(null, FALSE, duration, TRUE, TRUE, TRUE)

for(var/obj/item/explosive/grenade/flare/flare in range(range, owner))
if(!flare.active)
continue
flare.turn_off()

// ***************************************
// *********** Petrify
Expand Down

0 comments on commit 00efc22

Please sign in to comment.