From 00efc220d2ab5ac2df7035090974bd020f9d0101 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Sat, 13 Jul 2024 21:01:26 +0300 Subject: [PATCH] nightfall extuinguishes active flares --- .../carbon/xenomorph/castes/king/abilities_king.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm b/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm index 7f503726db5..280405897dc 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm @@ -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, ) @@ -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