From 3dae4beda4f46f6d3d788dbd25a1b74a5bd02d25 Mon Sep 17 00:00:00 2001
From: "VivianFoxfoot@gmail.com"
 <VivianFoxfoot@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 13 Apr 2012 16:02:27 +0000
Subject: [PATCH] Adds an adminverb to quickly take control of a mob, mostly
 for testing Mech fabricator can no longer sync while it has a queue Fixes
 resisting out of cuffbuckling.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3449 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/procs/helpers.dm      |  2 +-
 code/game/mecha/mech_fabricator.dm |  6 ++++++
 code/modules/admin/admin_verbs.dm  |  2 ++
 code/modules/admin/verbs/debug.dm  | 11 +++++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index 9e561f6969..6dc81d9191 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -1301,7 +1301,7 @@ proc/listclearnulls(list/list)
 
 	for(var/i = 0, i<numticks, i++)
 		sleep(delayfraction)
-		if(!user || !user.canmove || !(user.loc == T) || !(user.equipped() == holding))
+		if(!user || user.stat || user.weakened || user.stunned || !(user.loc == T) || !(user.equipped() == holding))
 			return 0
 
 	return 1
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 9708cc56fd..c6ac19dfb6 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -429,6 +429,12 @@
 
 
 	proc/sync(silent=null)
+		if(queue.len)
+			if(!silent)
+				temp = "Error.  Please clear processing queue before updating!"
+				src.updateUsrDialog()
+			return
+
 		if(!silent)
 			temp = "Updating local R&D database..."
 			src.updateUsrDialog()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index f9bcb6ff3a..d87d9603ad 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -254,6 +254,7 @@
 			//verbs += /client/proc/give_spell 							--Merged with view variables
 			//verbs += /client/proc/cmd_admin_ninjafy					--Merged with view variables
 			//verbs += /client/proc/cmd_switch_radio					--removed as tcommsat is staying
+			verbs += /client/proc/cmd_ASSUME_DIRECT_CONTROL
 		else	return
 
 		//Game Master
@@ -415,6 +416,7 @@
 	verbs -= /client/proc/togglebuildmodeself
 	verbs -= /client/proc/kill_airgroup
 	verbs -= /client/proc/debug_master_controller
+	verbs -= /client/proc/cmd_ASSUME_DIRECT_CONTROL
 	return
 
 
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index b83aba8be2..0fc59da74b 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -356,6 +356,17 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	else
 		alert("Invalid mob")
 
+/client/proc/cmd_ASSUME_DIRECT_CONTROL(var/mob/M in world)
+	set category = "Admin"
+	set name = "ASSUME DIRECT CONTROL"
+	set desc = "DIRECT INTERVENTION IS NECESSARY"
+
+	M.ckey = usr.ckey
+
+
+
+
+
 /client/proc/cmd_switch_radio()
 	set category = "Debug"
 	set name = "Switch Radio Mode"