From 43f6fc3d8c6378f26d9c6a43e2c09d0bf67a7a33 Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Tue, 12 Jul 2016 14:42:11 -0400
Subject: [PATCH] Fixes absurdly delayed Spatial Gateways

---
 code/game/gamemodes/clock_cult/clock_scripture.dm | 2 +-
 code/game/gamemodes/clock_cult/clock_unsorted.dm  | 4 ++--
 tgstation.dme                                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/game/gamemodes/clock_cult/clock_scripture.dm b/code/game/gamemodes/clock_cult/clock_scripture.dm
index 94caf900531..6489d3f65e0 100644
--- a/code/game/gamemodes/clock_cult/clock_scripture.dm
+++ b/code/game/gamemodes/clock_cult/clock_scripture.dm
@@ -664,7 +664,7 @@ Judgement: 10 servants, 100 CV, and any existing AIs are converted or destroyed
 	if(ratvar_awakens)
 		portal_uses = max(portal_uses, 100) //Very powerful if Ratvar has been summoned
 		duration = max(duration, 100)
-	return invoker.procure_gateway(invoker, duration, portal_uses)
+	return slab.procure_gateway(invoker, duration, portal_uses)
 
 
 
diff --git a/code/game/gamemodes/clock_cult/clock_unsorted.dm b/code/game/gamemodes/clock_cult/clock_unsorted.dm
index a0df36117ea..0add463794f 100644
--- a/code/game/gamemodes/clock_cult/clock_unsorted.dm
+++ b/code/game/gamemodes/clock_cult/clock_unsorted.dm
@@ -108,8 +108,8 @@
 		return 0
 	var/input_target_key = input(invoker, "Choose a target to form a rift to.", "Spatial Gateway") as null|anything in possible_targets
 	var/atom/movable/target = possible_targets[input_target_key]
-	if(!target || !invoker.canUseTopic(src, BE_CLOSE))
-		return 0
+	if(!src || !target || !invoker || !invoker.canUseTopic(src, BE_CLOSE) || !is_servant_of_ratvar(invoker) || (istype(src, /obj/item) && invoker.get_active_hand() != src))
+		return 0 //if any of the involved things no longer exist, the invoker is stunned, too far away to use the object, or does not serve ratvar, or if the object is an item and not in the mob's active hand, fail
 	var/istargetobelisk = istype(target, /obj/structure/clockwork/powered/clockwork_obelisk)
 	if(istargetobelisk)
 		gateway_uses *= 2
diff --git a/tgstation.dme b/tgstation.dme
index d4548f49979..c391880b530 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -313,8 +313,8 @@
 #include "code\game\gamemodes\changeling\powers\mimic_voice.dm"
 #include "code\game\gamemodes\changeling\powers\mutations.dm"
 #include "code\game\gamemodes\changeling\powers\panacea.dm"
-#include "code\game\gamemodes\changeling\powers\revive.dm"
 #include "code\game\gamemodes\changeling\powers\regenerate.dm"
+#include "code\game\gamemodes\changeling\powers\revive.dm"
 #include "code\game\gamemodes\changeling\powers\shriek.dm"
 #include "code\game\gamemodes\changeling\powers\spiders.dm"
 #include "code\game\gamemodes\changeling\powers\strained_muscles.dm"