mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 02:16:05 +00:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user