From 0418911e0bc01d5c926b134ebd2c40f41dcf1eb0 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 12 Nov 2016 21:35:55 -0600 Subject: [PATCH] Robots should not be shocked by wires/machines --- code/modules/power/power.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 7409f86e388..7697fdf6a45 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -322,8 +322,9 @@ //power_source is a source of electricity, can be powercell, area, apc, cable, powernet or null //source is an object caused electrocuting (airlock, grille, etc) //No animations will be performed by this proc. -/proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0) +/proc/electrocute_mob(mob/living/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0) if(istype(M.loc,/obj/mecha)) return 0 //feckin mechs are dumb + if(issilicon(M)) return 0 //No more robot shocks from machinery var/area/source_area if(istype(power_source,/area)) source_area = power_source