cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-10 14:44:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12

Browse Source 
Conflicts:
	code/game/vote.dm

Because I did it derpily.
This commit is contained in:
Miniature
2011-12-03 19:30:28 +10:30
parent f62eccc76b 0adfd00e88
commit 2159409d53
29 changed files with 212 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+2 -1
View File
@@ -226,7 +226,7 @@
verbs += /client/proc/cmd_admin_create_centcom_report
verbs += /client/proc/toggle_hear_deadcast
verbs += /client/proc/toggle_hear_radio
verbs += /client/proc/cmd_admin_change_custom_event
if (holder.level >= 0)//Mod********************************************************************
verbs += /obj/admins/proc/toggleAI //Toggle the AI
@@ -392,6 +392,7 @@
verbs -= /client/proc/toggle_hear_deadcast
verbs -= /client/proc/toggle_hear_radio
verbs -= /client/proc/tension_report
verbs -= /client/proc/cmd_admin_change_custom_event
return