From 87ceb9d75141efe44110c922c91a726c2eddea38 Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Wed, 14 Nov 2012 00:18:16 +0000 Subject: [PATCH] -Emergency revert of r5051. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5059 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/machinery.dm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 1a9252ab3bb..c02d923571f 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -184,18 +184,15 @@ Class Procs: /obj/machinery/attack_paw(mob/user as mob) return src.attack_hand(user) -/obj/machinery/interact(mob/user as mob) - return src.attack_hand(user) - /obj/machinery/attack_hand(mob/user as mob) if(stat & (NOPOWER|BROKEN|MAINT)) return 1 if(user.lying || user.stat) return 1 - if ( ! (istype(user, /mob/living/carbon/human) || \ - istype(user, /mob/living/silicon) || \ - istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") ) - user << "\red You don't have the dexterity to do this!" + if ( ! (istype(usr, /mob/living/carbon/human) || \ + istype(usr, /mob/living/silicon) || \ + istype(usr, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") ) + usr << "\red You don't have the dexterity to do this!" return 1 /* //distance checks are made by atom/proc/DblClick