cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update emote.dm

Browse Source
This commit is contained in:
Novacat
2021-02-28 17:40:21 -05:00
committed by GitHub
parent 8baa0568b0
commit 85485c41c4
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/emote.dm
+4 -9
View File
@@ -37,20 +37,15 @@
var/mob/M = mob
spawn(0) // It's possible that it could be deleted in the meantime, or that it runtimes.
if(M)
<<<<<<< HEAD
//VOREStation edit
if(istype(M, /mob/observer/dead/))
if(isobserver(M))
//VOREStation Edit Start
var/mob/observer/dead/D = M
if(ckey || (src in view(D)))
M.show_message(message, m_type)
message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
else
M.show_message(message, m_type)
//End VOREStation edit
=======
if(isobserver(M))
message = "<span class='emote'><B>[src]</B> ([ghost_follow_link(src, M)]) [input]</span>"
M.show_message(message, m_type)
>>>>>>> 47c1641... Merge pull request #7796 from Atermonera/ghost_emote
//VOREStation Edit End
for(var/obj in o_viewers)
var/obj/O = obj