From b604d93336fc3ec56a4e31cf298ab99a7b538a43 Mon Sep 17 00:00:00 2001
From: Davidj361 <david.j.361@gmail.com>
Date: Sat, 24 Mar 2018 06:35:35 -0400
Subject: [PATCH] Fixed Ranged Guardian moving when recalled (#36643)

---
 .../living/simple_animal/guardian/types/ranged.dm    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
index ccec94bea8b..5adcc8b2924 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
@@ -37,7 +37,6 @@
 			environment_smash = initial(environment_smash)
 			alpha = 255
 			range = initial(range)
-			incorporeal_move = FALSE
 			to_chat(src, "<span class='danger'><B>You switch to combat mode.</span></B>")
 			toggle = FALSE
 		else
@@ -48,7 +47,6 @@
 			environment_smash = ENVIRONMENT_SMASH_NONE
 			alpha = 45
 			range = 255
-			incorporeal_move = INCORPOREAL_MOVE_BASIC
 			to_chat(src, "<span class='danger'><B>You switch to scout mode.</span></B>")
 			toggle = TRUE
 	else
@@ -123,3 +121,13 @@
 
 /obj/effect/snare/singularity_pull()
 	return
+
+/mob/living/simple_animal/hostile/guardian/ranged/Manifest(forced)
+	if (toggle)
+		incorporeal_move = INCORPOREAL_MOVE_BASIC
+	. = ..()
+
+/mob/living/simple_animal/hostile/guardian/ranged/Recall(forced)
+	// To stop scout mode from moving when recalled
+	incorporeal_move = FALSE
+	. = ..()
\ No newline at end of file