From 22f503b517d603b060d385fe1326d084d41b4305 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 25 May 2017 02:17:59 -0400 Subject: [PATCH] Well AIs work. --- code/datums/holocall.dm | 6 +++--- code/game/machinery/hologram.dm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index afbb17e9ac2..13576cf68c7 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -123,8 +123,8 @@ eye.name = "Camera Eye ([user.name])" user.remote_control = eye user.remote_view = 1 - user.reset_perspective(eye) - eye.setLoc(eye.loc) + user.reset_perspective(get_turf(H)) + eye.setLoc(get_turf(H)) //Checks the validity of a holocall and qdels itself if it's not. Returns TRUE if valid, FALSE otherwise /datum/holocall/proc/Check() @@ -140,7 +140,7 @@ if(.) if(connected_holopad) - . = !qdeleted(connected_holopad) && !(calling_holopad.stat & NOPOWER) + . = !qdeleted(connected_holopad) && !(connected_holopad.stat & NOPOWER) else . = world.time < (call_start_time + HOLOPAD_MAX_DIAL_TIME) if(!.) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 76183b007e7..0800cf119a3 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -249,16 +249,16 @@ var/list/holopads = list() var/area/eye_area = get_area(AI.eyeobj) if(eye_area != holo_area) - clear_holo(master) return 1 var/obj/machinery/hologram/holopad/pad_close = get_closest_atom(/obj/machinery/hologram/holopad, holopads, AI.eyeobj) if(get_dist(pad_close, AI.eyeobj) <= pad_close.holo_range) - unset_holo(AI) + clear_holo(AI) pad_close.activate_holo(AI, 1) else continue - clear_holo(master)//If not, we want to get rid of the hologram. + + clear_holo(master)//If is a non AI holo clear it. if(outgoing_call) outgoing_call.Check()