From 19b7120e7b72165bcdd10834ab119ba443693bf2 Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Wed, 5 Nov 2025 05:21:56 -0500
Subject: [PATCH] Staff of storms works on basic mobs, buff for new movement /
storms (#30818)
---
code/modules/mining/lavaland/loot/legion_loot.dm | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/code/modules/mining/lavaland/loot/legion_loot.dm b/code/modules/mining/lavaland/loot/legion_loot.dm
index 28390dfecab..4e3214934cf 100644
--- a/code/modules/mining/lavaland/loot/legion_loot.dm
+++ b/code/modules/mining/lavaland/loot/legion_loot.dm
@@ -116,16 +116,13 @@
to_chat(user, "You don't want to hurt anyone!")
return
var/power_boosted = FALSE
- for(var/V in SSweather.processing)
- var/datum/weather/W = V
- if((target_turf.z in W.impacted_z_levels) && is_type_in_list(target_area, W.area_types))
- power_boosted = TRUE
- break
+ if(iswizard(user) || is_mining_level(user.z) || istype(get_area(user), /area/ruin/space/bubblegum_arena))
+ power_boosted = TRUE
playsound(src, 'sound/magic/lightningshock.ogg', 10, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0)
targeted_turfs += target_turf
to_chat(user, "You aim at [target_turf]!")
new /obj/effect/temp_visual/thunderbolt_targeting(target_turf)
- addtimer(CALLBACK(src, PROC_REF(throw_thunderbolt), target_turf, power_boosted, user), 1.5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(throw_thunderbolt), target_turf, power_boosted, user), 1 SECONDS)
thunder_charges--
addtimer(CALLBACK(src, PROC_REF(recharge)), thunder_charge_time)
@@ -147,7 +144,7 @@
new /obj/effect/temp_visual/electricity(T)
for(var/mob/living/hit_mob in T)
to_chat(hit_mob, "You've been struck by lightning!")
- hit_mob.electrocute_act(15 * (isanimal(hit_mob) ? 3 : 1) * (T == target ? 2 : 1) * (boosted ? 2 : 1), src, flags = SHOCK_TESLA|SHOCK_NOSTUN)
+ hit_mob.electrocute_act(15 * (isanimal_or_basicmob(hit_mob) ? 3 : 1) * (T == target ? 2 : 1) * (boosted ? 2 : 1), src, flags = SHOCK_TESLA|SHOCK_NOSTUN)
if(ishostile(hit_mob))
var/mob/living/simple_animal/hostile/H = hit_mob //mobs find and damage you...
if(H.stat == CONSCIOUS && !H.target && H.AIStatus != AI_OFF && !H.client)