cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
This commit is contained in:
Markolie
2015-02-22 19:12:11 +01:00
parent 982102a407 1f5ef8d4dd
commit 72db213067
68 changed files with 566 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+3 -3
View File
@@ -1,9 +1,10 @@
//admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless
var/list/admin_verbs_default = list(
// /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/
/client/proc/deadmin_self /*destroys our own admin datum so we can play as a regular player*/
/client/proc/deadmin_self, /*destroys our own admin datum so we can play as a regular player*/
// /client/proc/check_antagonists, /*shows all antags*/
// /client/proc/deadchat /*toggles deadchat on/off*/
/client/proc/cmd_mentor_check_new_players
)
var/list/admin_verbs_admin = list(
/client/proc/check_antagonists, /*shows all antags*/
@@ -176,8 +177,7 @@ var/list/admin_verbs_mod = list(
var/list/admin_verbs_mentor = list(
/client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/
/client/proc/cmd_admin_pm_by_key_panel, /*admin-pm list by key*/
/client/proc/cmd_mentor_check_new_players
/client/proc/cmd_admin_pm_by_key_panel /*admin-pm list by key*/
)
/client/proc/add_admin_verbs()
code/modules/admin/verbs/pray.dm
+4 -60
View File
@@ -15,23 +15,9 @@
var/image/cross = image('icons/obj/storage.dmi',"bible")
msg = "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"
var/list/eventholders = list()
var/list/banholders = list()
for(var/client/X in admins)
if(R_EVENT & X.holder.rights)
eventholders += X
if(R_BAN & X.holder.rights)
banholders += X
if(eventholders.len)
for(var/client/C in eventholders)
if(C.prefs.toggles & CHAT_PRAYER)
C << msg
else if (banholders.len)
for(var/client/C in banholders)
if(C.prefs.toggles & CHAT_PRAYER)
C << msg
X << msg
usr << "Your prayers have been received by the gods."
@@ -42,64 +28,22 @@
var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
msg = "\blue <b><font color=orange>CENTCOMM:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
var/list/eventholders = list()
var/list/banholders = list()
for(var/client/X in admins)
if(R_EVENT & X.holder.rights)
eventholders += X
if(R_BAN & X.holder.rights)
banholders += X
if(eventholders.len)
for(var/client/C in eventholders)
C << msg
return
else if (banholders.len)
for(var/client/C in banholders)
C << msg
return
X << msg
/proc/Syndicate_announce(var/text , var/mob/Sender)
var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
msg = "\blue <b><font color='#DC143C'>SYNDICATE:</font> [key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>REPLY</A>):</b> [msg]"
var/list/eventholders = list()
var/list/banholders = list()
for(var/client/X in admins)
if(R_EVENT & X.holder.rights)
eventholders += X
if(R_BAN & X.holder.rights)
banholders += X
if(eventholders.len)
for(var/client/C in eventholders)
C << msg
return
else if (banholders.len)
for(var/client/C in banholders)
C << msg
return
X << msg
/proc/HONK_announce(var/text , var/mob/Sender)
var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
msg = "\blue <b><font color=pink>HONK:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;HONKReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
var/list/eventholders = list()
var/list/banholders = list()
for(var/client/X in admins)
if(R_EVENT & X.holder.rights)
eventholders += X
if(R_BAN & X.holder.rights)
banholders += X
if(eventholders.len)
for(var/client/C in eventholders)
C << msg
return
else if (banholders.len)
for(var/client/C in banholders)
C << msg
return
X << msg