cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 23:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Holocall Overhaul (#10370)

Browse Source
This commit is contained in:
Geeves
2020-11-04 11:20:56 +01:00
committed by GitHub
parent f332870e35
commit ea02d13ad0
5 changed files with 251 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/say.dm
+3 -3
View File
@@ -86,7 +86,7 @@
return
var/obj/machinery/hologram/holopad/H = src.holo
if(H && H.masters[src])//If there is a hologram and its master is the user.
if(H?.active_holograms[src])//If there is a hologram and its master is the user.
// AI can hear their own message, this formats it for them.
if(speaking)
to_chat(src, "<i><span class='game say'>Holopad transmitted, <span class='name'>[real_name]</span> [speaking.format_message(message, verb)]</span></i>")
@@ -135,7 +135,7 @@
return
var/obj/machinery/hologram/holopad/T = src.holo
if(T?.masters[src])
if(T?.active_holograms[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>")
@@ -148,7 +148,7 @@
/mob/living/silicon/ai/emote(var/act, var/type, var/message)
var/obj/machinery/hologram/holopad/T = src.holo
if(T?.masters[src]) //Is the AI using a holopad?
if(T?.active_holograms[src]) //Is the AI using a holopad?
src.holopad_emote(message)
else //Emote normally, then.
..()