diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 51fd1f088d1..30654a1c755 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -264,17 +264,16 @@ var/list/holopads = list() if(eye_area != holo_area) return 1 - else - var/turf/target_turf = get_turf(AI.eyeobj) - 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.holo.forceMove(target_turf) - pad_close.AI.holo.dir = newdir//runtime + var/turf/target_turf = get_turf(AI.eyeobj) + 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.hologram.forceMove(target_turf) + pad_close.hologram.dir = newdir//runtime else continue clear_holo(master)//If not, we want to get rid of the hologram. diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index c91fbca3b76..0928769d24b 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -75,7 +75,7 @@ if(!message) return - var/obj/machinery/holopad/T = current + var/obj/machinery/hologram/holopad/T = current if(istype(T) && T.masters[src]) //Human-like, sorta, heard by those who understand humans. @@ -116,7 +116,7 @@ if(!message) return - var/obj/machinery/holopad/T = current + var/obj/machinery/hologram/holopad/T = current if(istype(T) && T.masters[src]) var/rendered = "[name] [message]" to_chat(src, "Holopad action relayed, [real_name] [message]") @@ -129,7 +129,7 @@ return 1 /mob/living/silicon/ai/emote(var/act, var/type, var/message) - var/obj/machinery/holopad/T = current + var/obj/machinery/hologram/holopad/T = current if(istype(T) && T.masters[src])//Is the AI using a holopad? src.holopad_emote(message) else //Emote normally, then.