From d5c1428a6aaa650bdc0fc3487d0c58f0e1ff7741 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 13 May 2017 00:14:15 -0400 Subject: [PATCH] still got runtimes --- code/_onclick/ai.dm | 4 ++-- code/datums/holocall.dm | 12 ++++++------ code/game/machinery/hologram.dm | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 4e907975426..70f930ebf16 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -158,8 +158,8 @@ /atom/proc/AICtrlClick(var/mob/living/silicon/ai/user) if(user.holo) - var/obj/machinery/hologram/holopad/H = user.holo - H.face_atom(src)//runtime + var/obj/effect/overlay/holo_pad_hologram/H = user.holo + H.face_atom(src) return /obj/machinery/door/airlock/AICtrlClick() // Bolts doors diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 1ef623179a5..7c5b0d1856a 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -33,7 +33,7 @@ LAZYADD(H.holo_calls, src) if(!dialed_holopads.len) - calling_holopad.visible_message("Connection failure.") + calling_holopad.atom_say("Connection failure.") qdel(src) return @@ -70,9 +70,9 @@ /datum/holocall/proc/Disconnect(obj/machinery/hologram/holopad/H) testing("Holocall disconnect") if(H == connected_holopad) - calling_holopad.visible_message("[usr] disconnected.") + calling_holopad.atom_say("[usr] disconnected.") else if(H == calling_holopad && connected_holopad) - connected_holopad.visible_message("[usr] disconnected.") + connected_holopad.atom_say("[usr] disconnected.") ConnectionFailure(H, TRUE) @@ -81,7 +81,7 @@ testing("Holocall connection failure: graceful [graceful]") if(H == connected_holopad || H == calling_holopad) if(!graceful) - calling_holopad.visible_message("Connection failure.") + calling_holopad.atom_say("Connection failure.") qdel(src) return @@ -89,7 +89,7 @@ dialed_holopads -= H if(!dialed_holopads.len) if(graceful) - calling_holopad.visible_message("Call rejected.") + calling_holopad.atom_say("Call rejected.") log_debug("No recipients, terminating") qdel(src) @@ -151,7 +151,7 @@ else . = world.time < (call_start_time + HOLOPAD_MAX_DIAL_TIME) if(!.) - calling_holopad.visible_message("No answer recieved.") + calling_holopad.atom_say("No answer recieved.") calling_holopad.temp = "" if(!.) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 966ba88ed23..51fd1f088d1 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -266,15 +266,15 @@ var/list/holopads = list() else var/turf/target_turf = get_turf(AI.eyeobj) - //var/newdir = hologram.dir + var/newdir = AI.holo.dir clear_holo()//If not, we want to get rid of the hologram. 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) if(!(pad_close.stat & NOPOWER) && !pad_close.masters[src]) pad_close.activate_holo(AI, 1) if(pad_close.masters[src]) - pad_close.AI.forceMove(target_turf) - //pad_close.hologram.dir = newdir + pad_close.AI.holo.forceMove(target_turf) + pad_close.AI.holo.dir = newdir//runtime else continue clear_holo(master)//If not, we want to get rid of the hologram. @@ -332,10 +332,10 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad == src && speaker != HC.hologram) - HC.user.hear_message(speaker, message, verb, message_language)//<