cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undid my hologram changes. I could have sworn that wasn't ticked.

Browse Source 
i suck at svn

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3549 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-05-03 18:11:02 +00:00
parent bbf7ab41b0
commit 3f99a92261
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/machinery/hologram.dm
View File

@@ -28,17 +28,20 @@ Possible to do for anyone motivated enough:
/obj/machinery/hologram/holopad/attack_ai(mob/living/silicon/ai/user) /obj/machinery/hologram/holopad/attack_ai(mob/living/silicon/ai/user)
if (!istype(user)) if (!istype(user))
return 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. 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.*/ 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) 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. else if(master==user)//If there is a hologram, remove it. But only if the user is the master. Otherwise do nothing.
clear_holo() clear_holo()
return return
/obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user) /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. if(!hologram)//If there is not already a hologram.
create_holo(user)//Create one. create_holo(user)//Create one.
for(var/mob/M in viewers()) for(var/mob/M in viewers())