From 1e6e16e51a4ede30c366a0419d676c75c835ebd6 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Fri, 3 Feb 2017 23:00:31 +0000 Subject: [PATCH] Tesla balls cannot dust people near grounding rods :cl: coiax del: Tesla balls cannot dust people near grounding rods. /:cl: - The tesla is SUPER deadly right now, anyway. If mildly charged, will kill anyone unprotected. And people can STILL get dusted, even if they've painstakingly set up a net of grounding rods. - If you're hiding under only one, you're safe from the electricity and dusting, but there are machines that explode all over the station. Only a wide net provides any sort of cover. - Basically, let's reward people for actually using grounding rods, instead of getting RNG dusted if they don't cover in a locker for however long it takes for Lady Tesla to leave. --- code/modules/power/tesla/energy_ball.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 80224c622a7..e02895cc837 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -152,9 +152,12 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics, /obj/singularity/energy_ball/proc/dust_mobs(atom/A) - if(istype(A, /mob/living/carbon)) - var/mob/living/carbon/C = A - C.dust() + if(!iscarbon(A)) + return + for(var/obj/machinery/power/grounding_rod/GR in orange(src, 2)) + return + var/mob/living/carbon/C = A + C.dust() /proc/tesla_zap(atom/source, zap_range = 3, power, explosive = FALSE) . = source.dir