cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

still runtimes

Browse Source
This commit is contained in:
Aurorablade
2017-05-14 00:08:21 -04:00
parent d5c1428a6a
commit eb17dc8f8b
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/hologram.dm
+10 -11
View File
@@ -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.
code/modules/mob/living/silicon/say.dm
+3 -3
View File
@@ -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 = "<span class='game say'><span class='name'>[name]</span> <span class='message'>[message]</span></span>"
to_chat(src, "<i><span class='game say'>Holopad action relayed, <span class='name'>[real_name]</span> <span class='message'>[message]</span></span></i>")
@@ -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.