cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed private messages to forward to client from mob rather than the other way around. As it makes more sense.

Browse Source 
Merged the Admin-PM verb and the PM stuff in Topic() as it was 99% the same code anyway.
Admin to Admin PMs are no longer annoying and LOUD: "-- ADMIN PRIVATE MESSAGE --"
All Admin PM messages to non-admins are now 'LOUD'.
Admin-PM verb is now sorted by Mob rather than client as per request
Can again PM mobs by right clicking them.
Apologies for totally missing the last 2 things on my last commit :S

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3381 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-04-01 02:28:30 +00:00
parent 5d5308fdca
commit 81d6e5abb3
3 changed files with 62 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+9 -47
View File
@@ -605,58 +605,20 @@
/client/Topic(href, href_list)
if(href_list["priv_msg"]) //All PM links have clients as their SRC-s (So that you always PM the same client even if they change mob (ghost, observe, etc.)), but PM code is in mob/topic() So this redirects the call.
if(mob)
mob.Topic(href, href_list)
if(href_list["priv_msg"])
var/client/C = locate(href_list["priv_msg"])
if(ismob(C)) //Old stuff can pass in mobs instead of clients
var/mob/M = C
C = M.client
cmd_admin_pm(C)
else
..()
/mob/Topic(href, href_list)
if(href_list["priv_msg"])
var/client/C = locate(href_list["priv_msg"])
if(href_list["priv_msg"]) //for priv_msg references that have yet to be updated to target clients. Forwards it to client/Topic()
if(client)
client.Topic(href, href_list)
if(ismob(C)) //Old stuff can pass in mobs instead of clients
var/mob/M = C
C = M.client
if(C)
if(src.client && client.muted_complete)
src << "You are muted have a nice day"
return
if (!istype(C,/client))
src << "\red not a client."
return
if ( !( src.client.holder || C.holder ) ) //neither of the two is an admin.
src.client << "\red Admin-player or player-admin conversation only!"
return.
//get message text, limit it's length.and clean/escape html
var/t = input("Message:", "Private message to [C.key]") as text|null
t = sanitize( copytext(t,1,500) )
if (!t || !usr || !C || !usr.client) return
if (usr.client && usr.client.holder) //Admin is messaging a player
C << "\red <font size='4'><b>-- Administrator private message --</b></font>"
C << "<b>[key_name(usr.client, C, 0)] [t]</b>"
C << "Click on the administrator's name to reply."
usr << "\blue Admin PM to <b>[key_name(C, usr.client, 1)]</b>: [t]"
else
if (C)
if (C.holder)
C << "\blue Reply PM from <b>[key_name(usr.client, C, 1)]</b>: [t]"
else
C << "\red Reply PM from <b>[key_name(usr.client, C, 0)]</b>: [t]"
usr.client << "\blue Reply PM to <b>[key_name(C, usr.client, 0)]</b>: [t]"
log_admin("PM: [usr.client.key]->[C.key] : [t]")
//we don't use message_admins here because the sender/receiver might get it too
for (var/mob/K in world)
if(K && usr)
if(K.client && K.client.holder && K.key != usr.key && K.key != C.key)
K << "<b><font color='blue'>PM: [key_name(usr.client, K.client)]->[key_name(C, K.client)]:</b> \blue [t]</font>"
else
client << "\red Client disconnected"
if(href_list["mach_close"])
var/t1 = text("window=[href_list["mach_close"]]")
machine = null