From 7d2226d249b7420e1bfe255d70c56c9eb6ac5380 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Sun, 5 Dec 2010 19:10:09 +0000 Subject: [PATCH] Got my borg lockdown working as desired. Borgs so disabled are now able to talk (and robotalk), but unable to move or interact with things. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@540 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/atom_procs.dm | 1 + code/game/machinery/computer/robot.dm | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index 9b3f3809e4e..ef19edb4156 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -194,6 +194,7 @@ var/mob/living/silicon/ai/ai = usr if (ai.control_disabled) return + if (usr:lockcharge) return ..() diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 11fd2a4dc1c..5fb80ae5451 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -194,12 +194,12 @@ // message_admins("\blue [key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!") R.canmove = !R.canmove if (R.lockcharge) - R.cell.charge = R.lockcharge - R.lockcharge = null - R << "Your lockdown has been removed!" + // R.cell.charge = R.lockcharge + R.lockcharge = !R.lockcharge + R << "Your lockdown has been lifted!" else - R.lockcharge = R.cell.charge - R.cell.charge = 0 + R.lockcharge = !R.lockcharge + // R.cell.charge = 0 R << "You have been locked down!" else