shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes timestop! (and tweaks its sounds) (#2019)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-15 13:45:11 -05:00
committed by kevinz000
parent 62180f8953
commit b2f20fffd8
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/xenobiology.dm
+5 -4
View File
@@ -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)