From e70b26fd66090b71140c40e8e29ed5df050377de Mon Sep 17 00:00:00 2001
From: 4dplanner <3combined@gmail.com>
Date: Thu, 23 May 2019 20:22:36 +0100
Subject: [PATCH] Fixes timestop interaction with antimagic

---
 code/modules/fields/timestop.dm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/fields/timestop.dm b/code/modules/fields/timestop.dm
index ea6a0f06a08..ed38b73771e 100644
--- a/code/modules/fields/timestop.dm
+++ b/code/modules/fields/timestop.dm
@@ -73,6 +73,11 @@
 /datum/proximity_monitor/advanced/timestop/proc/freeze_atom(atom/movable/A)
 	if(immune[A] || global_frozen_atoms[A] || !istype(A))
 		return FALSE
+	if(ismob(A))
+		var/mob/M = A
+		if(M.anti_magic_check(check_anti_magic, check_holy))
+			immune[A] = TRUE
+			return
 	var/frozen = TRUE
 	if(isliving(A))
 		freeze_mob(A)
@@ -154,9 +159,6 @@
 
 /datum/proximity_monitor/advanced/timestop/proc/freeze_mob(mob/living/L)
 	frozen_mobs += L
-	if(L.anti_magic_check(check_anti_magic, check_holy))
-		immune += L
-		return
 	L.Stun(20, 1, 1)
 	walk(L, 0) //stops them mid pathing even if they're stunimmune
 	if(isanimal(L))