From f873b86b35bb91da29738a9502dbefa7cd133f1f Mon Sep 17 00:00:00 2001 From: "baloh.matevz@gmail.com" Date: Fri, 18 Jan 2013 03:12:43 +0000 Subject: [PATCH] - Small edit to the movement killswitch. The person who enables it will now be allowed to move, so he can try to detect any change to lag. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5572 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/turfs/simulated.dm | 2 +- code/game/turfs/turf.dm | 2 +- code/modules/admin/verbs/mapping.dm | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 02d572e51e..73bacff124 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -14,7 +14,7 @@ levelupdate() /turf/simulated/Entered(atom/A, atom/OL) - if(movement_disabled) + if(movement_disabled && usr.ckey != movement_disabled_exception) usr << "\red Movement is admin-disabled." //This is to identify lag problems return diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index df5226c958..4d5c3c7c2d 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -68,7 +68,7 @@ return 0 /turf/Enter(atom/movable/mover as mob|obj, atom/forget as mob|obj|turf|area) - if(movement_disabled) + if(movement_disabled && usr.ckey != movement_disabled_exception) usr << "\red Movement is admin-disabled." //This is to identify lag problems return if (!mover || !isturf(mover.loc)) diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 8cfde1c2ff..d8a89eb59c 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -288,6 +288,7 @@ var/global/say_disabled = 0 //This proc is intended to detect lag problems relating to movement var/global/movement_disabled = 0 +var/global/movement_disabled_exception //This is the client that calls the proc, so he can continue to run around to gauge any change to lag. /client/proc/disable_movement() set category = "Mapping" set name = "Disable all movement" @@ -295,5 +296,6 @@ var/global/movement_disabled = 0 movement_disabled = !movement_disabled if(movement_disabled) message_admins("[src.ckey] used 'Disable all movement', killing all movement.") + movement_disabled_exception = usr.ckey else message_admins("[src.ckey] used 'Disable all movement', restoring all movement.") \ No newline at end of file