From eb360674e43cd8c7d9eb3493d2c5e1b82c692ecf Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Wed, 21 Oct 2015 14:21:24 -0400 Subject: [PATCH] Sparks first, THEN emag, so if the emag act spawns anywhere, the sparks appear while it's doing the emag act. --- .../mob/living/simple_animal/revenant/revenant_abilities.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm index dced751ac2c..283fc6ab071 100644 --- a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm +++ b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm @@ -162,16 +162,16 @@ spawn(0) for(var/obj/machinery/bot/bot in T.contents) if(!bot.emagged) + new/obj/effect/overlay/temp/revenant(bot.loc) bot.locked = 0 bot.open = 1 bot.Emag(null) - new/obj/effect/overlay/temp/revenant(bot.loc) for(var/obj/machinery/mach in T.contents) if(istype(mach, /obj/machinery/dominator) || istype(mach, /obj/machinery/power/apc) || istype(mach, /obj/machinery/power/smes) || istype(mach, /obj/machinery/bot)) //Doesn't work on dominators, SMES and APCs, to prevent kekkery //Also doesn't work on bots so they can go do stuff faster(god this is so ugly) continue if(prob(30)) - mach.emag_act(null) new/obj/effect/overlay/temp/revenant(mach.loc) + mach.emag_act(null) else mach.emp_act(1) for(var/mob/living/silicon/robot/S in T.contents) //Only works on cyborgs, not AI