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

Merge pull request #5801 from Citadel-Station-13/upstream-merge-35895

Browse Source 
[MIRROR] Fixes Guardian Spirits not being able to move in stopped time along with their user.
This commit is contained in:
deathride58
2018-03-05 03:16:48 +00:00
committed by GitHub
parent 4476d559bd abf05a5f81
commit d720adf672
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/fields/timestop.dm
+3
View File
@@ -29,6 +29,9 @@
for(var/mob/living/L in GLOB.player_list) for(var/mob/living/L in GLOB.player_list)
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 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] = TRUE immune[L] = TRUE
for(var/mob/living/simple_animal/hostile/guardian/G in GLOB.parasites)
if(G.summoner && locate(/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop) in G.summoner.mind.spell_list) //It would only make sense that a person's stand would also be immune.
immune[G] = TRUE
if(start) if(start)
timestop() timestop()