Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	code/controllers/master_controller.dm
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-04-14 19:17:06 +02:00
8 changed files with 65 additions and 34 deletions
+2
View File
@@ -78,6 +78,8 @@
C = M.client
if(!C) // Might be a stealthmin ID, so pass it in straight
C = href_list["priv_msg"]
else if(C.UID() != href_list["priv_msg"])
C = null // 404 client not found. Let cmd_admin_pm handle the error
cmd_admin_pm(C, null, href_list["type"])
return