cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +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/admin/admin_verbs.dm
+6 -3
View File
@@ -250,7 +250,8 @@
verbs += /obj/admins/proc/voteres //toggle votes
verbs += /client/proc/deadchat //toggles deadchat
verbs += /client/proc/cmd_admin_mute
verbs += /client/proc/cmd_admin_pm
verbs += /client/proc/cmd_admin_pm_context
verbs += /client/proc/cmd_admin_pm_panel
verbs += /client/proc/cmd_admin_subtle_message
verbs += /client/proc/warn
verbs += /obj/admins/proc/announce
@@ -375,7 +376,8 @@
verbs -= /obj/admins/proc/voteres //toggle votes
verbs -= /client/proc/deadchat //toggles deadchat
verbs -= /client/proc/cmd_admin_mute
verbs -= /client/proc/cmd_admin_pm
verbs -= /client/proc/cmd_admin_pm_context
verbs -= /client/proc/cmd_admin_pm_panel
verbs -= /client/proc/cmd_admin_say
verbs -= /client/proc/cmd_admin_subtle_message
verbs -= /client/proc/warn
@@ -778,7 +780,8 @@
verbs += /client/proc/game_panel
verbs += /client/proc/player_panel
verbs += /client/proc/cmd_admin_subtle_message
verbs += /client/proc/cmd_admin_pm
verbs += /client/proc/cmd_admin_pm_context
verbs += /client/proc/cmd_admin_pm_panel
verbs += /client/proc/cmd_admin_gib_self
verbs += /client/proc/deadchat //toggles deadchat
code/modules/admin/verbs/randomverbs.dm
+47 -27
View File
@@ -85,57 +85,77 @@
log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]")
message_admins("\blue \bold DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]<BR>", 1)
/client/proc/cmd_admin_pm()
//allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm
/client/proc/cmd_admin_pm_context(mob/M as mob in world)
set category = null
set name = "Admin PM Mob"
if(!authenticated || !holder)
src << "\red Error: Admin-PM-Context: Only administrators may use this command."
return
if( !ismob(M) || !M.client ) return
cmd_admin_pm(M.client)
//shows a list of clients we could send PMs to, then forwards our choice to cmd_admin_pm
/client/proc/cmd_admin_pm_panel()
set category = "Admin"
set name = "Admin PM"
if(!authenticated || !holder)
src << "Only administrators may use this command."
src << "\red Error: Admin-PM-Panel: Only administrators may use this command."
return
var/list/client/targets[0]
for(var/client/C)
if(C.mob)
if(istype(C.mob, /mob/new_player))
targets["[C] - (New Player)"] = C
else if(istype(C.mob, /mob/dead/observer))
targets["[C] - [C.mob.name](Ghost)"] = C
for(var/client/T)
if(T.mob)
if(istype(T.mob, /mob/new_player))
targets["(New Player) - [T]"] = T
else if(istype(T.mob, /mob/dead/observer))
targets["[T.mob.name](Ghost) - [T]"] = T
else
targets["[C] - [C.mob.real_name](as [C.mob.name])"] = C
targets["[T.mob.real_name](as [T.mob.name]) - [T]"] = T
else
targets["[C] - No Mob"] = C
targets["(No Mob) - [T]"] = T
targets = sortList(targets)
var/target = input(usr,"To whom shall we send a message?","Admin PM",null) in targets|null
cmd_admin_pm(targets[target])
var/target = input(usr,"To whom shall we send a message?","Admin PM",null) in targets
var/client/C = targets[target]
//takes input from cmd_admin_pm_context, cmd_admin_pm_panel or /client/Topic and sends them a PM after fetching a message to send.
/client/proc/cmd_admin_pm(var/client/C = null)
if( !C || !istype(C,/client) )
src << "\red Error: Admin-PM: Client not found."
return
if(src.muted_complete)
src << "\red Error: Admin-PM: You are muted."
return
//get message text, limit it's length.and clean/escape html
var/t = input("Message:", "Private message to [C.key]") as text|null
if( !(holder.rank in list("Game Admin", "Game Master")) )
if (!t || !C) return
if( !holder || !(holder.rank in list("Game Admin", "Game Master")) ) //clean the message if it's not sent by a GA or GM
t = sanitize(copytext(t,1,500))
if(!t) return
if ( !t || !C || !C.mob ) return
if(holder) //an Admin sent the message
if(!C.holder) C << "<font color='red' size='4'><b>-- Administrator private message --</b></font>" //only do LOUD PMs if the target isn't an admin. Hence making admin-to-admin PMs less annoying
C << "<font color='red'>Admin PM from-<b>[key_name(src, C, 0)]</b>:</font> [t]"
if(!C.holder) C << "<font color='red'><i>Click on the administrator's name to reply.</i></font>"
src << "<font color='blue'>Admin PM to-<b>[key_name(C, src, 1)]</b>:</font> [t]"
//TODO: rewrite key_name() to use something other than mobs. ~CARN
if (usr.client && usr.client.holder)
C << "\red Admin PM from-<b>[key_name(usr, C.mob, 0)]</b>: [t]"
src << "\blue Admin PM to-<b>[key_name(C, usr, 1)]</b>: [t]"
else
if (C && C.holder)
C << "\blue Reply PM from-<b>[key_name(usr, C.mob, 1)]</b>: [t]"
else //a non-Admin sent the message
if(C.holder)
src << "<font color='blue'>Reply PM to-<b>[key_name(C, src, 0)]</b>:</font> [t]"
C << "<font color='red'>Reply PM from-<b>[key_name(src, C, 0)]</b>:</font> [t]"
else
C << "\red Reply PM from-<b>[key_name(usr, C.mob, 0)]</b>: [t]"
src << "\blue Reply PM to-<b>[key_name(C.mob, usr, 0)]</b>: [t]"
src << "<font class='red'>Error: PM: Non-admin to non-admin PM communication is forbidden</font>"
return
log_admin("PM: [key_name(usr)]->[key_name(C.mob)] : [t]")
log_admin("PM: [key_name(src)]->[key_name(C)]: [t]")
for(var/client/X) //there are fewer clients than mobs
//we don't use message_admins here because the sender/receiver might get it too
for(var/client/X) //there are fewer clients than mobs
if(X.holder && X.key!=usr.key && X.key!=C.key) //check client/X is an admin and isn't the sender or recipient
var/mob/K = X.mob //get X's mob
if(K)
K << "<B><font color='blue'>PM: [key_name(usr, K)]-&gt;[key_name(C.mob, K)]:</B> \blue [t]</font>" //inform X
K << "<B><font color='blue'>PM: [key_name(src, K)]-&gt;[key_name(C, K)]:</B> \blue [t]</font>" //inform X
/client/proc/cmd_admin_godmode(mob/M as mob in world)
set category = "Special Verbs"