From 923934d623091776fc828d9696c6bef8d79f64a3 Mon Sep 17 00:00:00 2001
From: Potato-Masher <33107541+Potato-Masher@users.noreply.github.com>
Date: Sun, 4 Mar 2018 18:11:24 -0500
Subject: [PATCH 1/2] Fixes Guardian Spirits not being able to move in stopped
 time along with their user. (#35895)

* I have no idea if this will work, but hopefully makes stands immune to timestops if their master is.

* That looks better

* Maybe that will work, maybe it will not.

* Checks if the summoner actually exists.

As per review advice from @DaedalusGame.
---
 code/modules/fields/timestop.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/fields/timestop.dm b/code/modules/fields/timestop.dm
index 232e3c5dce..11a5d416e7 100644
--- a/code/modules/fields/timestop.dm
+++ b/code/modules/fields/timestop.dm
@@ -29,6 +29,9 @@
 	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
 			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)
 		timestop()