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

another huge sync

Browse Source
This commit is contained in:
LetterJay
2017-06-21 18:00:00 -05:00
parent 0719541100
commit d04001c09d
51 changed files with 1443 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/xenobiology.dm
+5 -3
View File
@@ -561,13 +561,15 @@
/obj/effect/timestop/Initialize()
. = ..()
for(var/mob/living/M in GLOB.player_list)
for(var/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop/T in M.mind.spell_list) //People who can stop time are immune to timestop
immune |= M
for(var/M in GLOB.living_mob_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
timestop()
/obj/effect/timestop/proc/timestop()
set waitfor = FALSE
playsound(get_turf(src), 'sound/magic/TIMEPARADOX2.ogg', 100, 1, -1)
for(var/i in 1 to duration-1)
for(var/atom/A in orange (freezerange, src.loc))