cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

AOOC for antags (#553)

Browse Source 
Antags now get AOOC, as do mods. Admins and mods can also mute people from AOOC if they're being silly.
This commit is contained in:
skull132
2016-07-11 16:52:20 +03:00
committed by GitHub
parent 4d94f46bd1
commit 7d9168a266
7 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+2 -1
View File
@@ -77,7 +77,8 @@ proc/admin_notice(var/message, var/rights)
<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_OOC]'><font color='[(muted & MUTE_OOC)?"red":"blue"]'>OOC</font></a> |
<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_PRAY]'><font color='[(muted & MUTE_PRAY)?"red":"blue"]'>PRAY</font></a> |
<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_ADMINHELP]'><font color='[(muted & MUTE_ADMINHELP)?"red":"blue"]'>ADMINHELP</font></a> |
<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_DEADCHAT]'><font color='[(muted & MUTE_DEADCHAT)?"red":"blue"]'>DEADCHAT</font></a>\]
<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_DEADCHAT]'><font color='[(muted & MUTE_DEADCHAT)?"red":"blue"]'>DEADCHAT</font></a> |
<A href='?src=\ref[src];mute=\ref[M];mute_Type=[MUTE_AOOC]'><font color='[(muted & MUTE_AOOC) ? "red" : "blue"]'>AOOC</font></a>\]
(<A href='?src=\ref[src];mute=\ref[M];mute_type=[MUTE_ALL]'><font color='[(muted & MUTE_ALL)?"red":"blue"]'>toggle all</font></a>)
"}
code/modules/admin/admin_verbs.dm
+2 -1
View File
@@ -297,7 +297,8 @@ var/list/admin_verbs_mod = list(
/client/proc/toggleattacklogs,
/client/proc/cmd_admin_check_contents,
/client/proc/check_words, /*displays cult-words*/
/client/proc/check_ai_laws /*shows AI and borg laws*/
/client/proc/check_ai_laws, /*shows AI and borg laws*/
/client/proc/aooc
)
var/list/admin_verbs_dev = list( //will need to be altered - Ryan784
code/modules/admin/verbs/antag-ooc.dm
+17 -6
View File
@@ -3,17 +3,28 @@
set name = "AOOC"
set desc = "Antagonist OOC"
if(!check_rights(R_ADMIN)) return
if (istype(src.mob, /mob/dead/observer) && !check_rights(R_ADMIN|R_MOD, 0))
src << "<span class='warning'>You cannot use AOOC while ghosting/observing!</span>"
return
if (src.prefs.muted & MUTE_AOOC)
src << "<span class='warning'>You are muted from speaking on AOOC!</span>"
return
msg = sanitize(msg)
if(!msg) return
if(!msg)
return
var/display_name = src.key
if(holder && holder.fakekey)
display_name = holder.fakekey
if (holder)
display_name = "[display_name]([holder.rank])"
if (holder.fakekey)
display_name = holder.fakekey
for(var/mob/M in mob_list)
if((M.mind && M.mind.special_role && M.client) || check_rights(R_ADMIN, 0, M))
if (check_rights(R_ADMIN|R_MOD, 0, M))
M << "<font color='#960018'><span class='ooc'>" + create_text_tag("aooc", "Antag-OOC:", M.client) + " <EM>[get_options_bar(src, 0, 1, 1)](A HREF='?_src_=holder;adminplayerobservejump=[src.mob]>JMP</A>):</EM> <span class='message'>[msg]</span></span></font>"
else if (M.mind && M.mind.special_role && M.client)
M << "<font color='#960018'><span class='ooc'>" + create_text_tag("aooc", "Antag-OOC:", M.client) + " <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
log_ooc("(ANTAG) [key] : [msg]")
log_ooc("(ANTAG) [key] : [msg]")
code/modules/admin/verbs/randomverbs.dm
+1
View File
@@ -181,6 +181,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
if(MUTE_PRAY) mute_string = "pray"
if(MUTE_ADMINHELP) mute_string = "adminhelp, admin PM and ASAY"
if(MUTE_DEADCHAT) mute_string = "deadchat and DSAY"
if(MUTE_AOOC) mute_string = "AOOC"
if(MUTE_ALL) mute_string = "everything"
else return