From 3f99a922618ecbd1cf6ce13f652eeddda74a2252 Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Thu, 3 May 2012 18:11:02 +0000 Subject: [PATCH] Undid my hologram changes. I could have sworn that wasn't ticked. i suck at svn git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3549 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/hologram.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 997313a01fe..d286943583d 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -28,17 +28,20 @@ Possible to do for anyone motivated enough: /obj/machinery/hologram/holopad/attack_ai(mob/living/silicon/ai/user) if (!istype(user)) return - /*There are pretty much only two ways to interact here. + /*There are pretty much only three ways to interact here. I don't need to check for client since they're clicking on an object. This may change in the future but for now will suffice.*/ - if(!hologram)//If there is no hologram, possibly make one. + if(user.client.eye!=src)//Set client eye on the object if it's not already. + user.current = src + user.reset_view(src) + else if(!hologram)//If there is no hologram, possibly make one. activate_holo(user) else if(master==user)//If there is a hologram, remove it. But only if the user is the master. Otherwise do nothing. clear_holo() return /obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user) - if(!(stat & NOPOWER))//If the projector has power. + if(!(stat & NOPOWER)&&user.client.eye==src)//If the projector has power and client eye is on it. if(!hologram)//If there is not already a hologram. create_holo(user)//Create one. for(var/mob/M in viewers())