Update client_procs.dm

This commit is contained in:
LetterJay
2017-12-29 18:38:32 -06:00
committed by GitHub
parent 1281bc24e9
commit 010c1e17ad
-4
View File
@@ -75,12 +75,8 @@
//Logs all hrefs, except chat pings
if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2))
<<<<<<< HEAD
WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")
=======
WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr]\[[COORD(usr)]\])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")
>>>>>>> 0687e88... Merge pull request #33835 from kevinz000/patch-415
// Admin PM
if(href_list["priv_msg"])
cmd_admin_pm(href_list["priv_msg"],null)