cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update topic.dm

Browse Source
This commit is contained in:
Novacat
2020-04-23 23:17:11 -04:00
committed by GitHub
parent 3e83916244
commit a9d049f8c2
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/admin/topic.dm
View File

@@ -1303,8 +1303,7 @@
for(var/client/X in admins) for(var/client/X in admins)
if((R_ADMIN|R_MOD|R_SERVER) & X.holder.rights) //VOREStation Edit if((R_ADMIN|R_MOD|R_SERVER) & X.holder.rights) //VOREStation Edit
to_chat(X, take_msg) to_chat(X, take_msg)
<<<<<<< HEAD to_chat(M, "<span class='filter_pm notice'><b>Your adminhelp is being attended to by [usr.client]. Thanks for your patience!</b></span>")
to_chat(M, "<span class='notice'><b>Your adminhelp is being attended to by [usr.client]. Thanks for your patience!</b></span>")
// VoreStation Edit Start // VoreStation Edit Start
if (config.chat_webhook_url) if (config.chat_webhook_url)
spawn(0) spawn(0)
@@ -1314,9 +1313,6 @@
query_string += "&user=[url_encode(key_name(M))]" query_string += "&user=[url_encode(key_name(M))]"
world.Export("[config.chat_webhook_url]?[query_string]") world.Export("[config.chat_webhook_url]?[query_string]")
// VoreStation Edit End // VoreStation Edit End
=======
to_chat(M, "<span class='filter_pm notice'><b>Your adminhelp is being attended to by [usr.client]. Thanks for your patience!</b></span>")
>>>>>>> 1ed5556... Adds empty filter classes to send messages to particular vchat filters. (#6998)
else else
to_chat(usr, "<span class='warning'>Unable to locate mob.</span>") to_chat(usr, "<span class='warning'>Unable to locate mob.</span>")