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

Merge branch 'upstream-master' into development-upstream

Browse Source 
# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm
This commit is contained in:
Werner
2017-10-07 15:13:33 +02:00
parent 052aad8294 7d85f2ce12
commit baa9c475c1
25 changed files with 247 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+2 -1
View File
@@ -375,7 +375,8 @@ var/list/admin_verbs_cciaa = list(
/client/proc/returntobody,
/client/proc/view_duty_log,
/datum/admins/proc/create_admin_fax,
/client/proc/check_fax_history
/client/proc/check_fax_history,
/client/proc/aooc
)
/client/proc/add_admin_verbs()
code/modules/admin/verbs/antag-ooc.dm
+2 -2
View File
@@ -3,7 +3,7 @@
set name = "AOOC"
set desc = "Antagonist OOC"
if (istype(src.mob, /mob/dead/observer) && !check_rights(R_ADMIN|R_MOD, 0))
if (istype(src.mob, /mob/dead/observer) && !check_rights(R_ADMIN|R_MOD|R_CCIAA, 0))
src << "<span class='warning'>You cannot use AOOC while ghosting/observing!</span>"
return
@@ -22,7 +22,7 @@
display_name = holder.fakekey
for(var/mob/M in mob_list)
if (check_rights(R_ADMIN|R_MOD, 0, M))
if (check_rights(R_ADMIN|R_MOD|R_CCIAA, 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=\ref[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>"