cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +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()