From b2f20fffd8db165219d6624526b6323dc090d53f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 15 Jul 2017 13:45:11 -0500 Subject: [PATCH] Fixes timestop! (and tweaks its sounds) (#2019) --- code/modules/research/xenobiology/xenobiology.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 6c9337b02a..93ac3324ac 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -563,16 +563,16 @@ /obj/effect/timestop/Initialize() . = ..() - for(var/M in GLOB.living_mob_list) + for(var/M in GLOB.player_list) var/mob/living/L = M - for(var/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop/T in L.mind.spell_list) //People who can stop time are immune to timestop - immune |= L + if(locate(/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop) in L.mind.spell_list) //People who can stop time are immune to its effects + immune += L timestop() /obj/effect/timestop/proc/timestop() set waitfor = FALSE - playsound(get_turf(src), 'sound/magic/timeparadox2.ogg', 100, 1, -1) + playsound(src, 'sound/magic/timeparadox2.ogg', 75, 1, -1) for(var/i in 1 to duration-1) for(var/atom/A in orange (freezerange, src.loc)) if(isliving(A)) @@ -598,6 +598,7 @@ stoplag() //End + playsound(src, 'sound/magic/timeparadox2.ogg', 75, TRUE, frequency = -1) //reverse! for(var/mob/living/M in stopped_atoms) unfreeze_mob(M)