cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 12:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
Conflicts:
	code/__HELPERS/unsorted.dm
This commit is contained in:
Mloc-Argent
2014-06-12 18:56:26 +01:00
parent 6d432d8e9d d20f547873
commit 9896e44d8a
20 changed files with 2314 additions and 2189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+16 -1
View File
@@ -1096,7 +1096,22 @@ var/global/floorIsLava = 0
if(istype(H))
H.regenerate_icons()
proc/get_options_bar(whom, detail = 2, name = 0, link = 1)
/*
helper proc to test if someone is a mentor or not. Got tired of writing this same check all over the place.
*/
/proc/is_mentor(client/C)
if(!istype(C))
return 0
if(!C.holder)
return 0
if(C.holder.rights == R_MENTOR)
return 1
return 0
/proc/get_options_bar(whom, detail = 2, name = 0, link = 1)
if(!whom)
return "<b>(*null*)</b>"
var/mob/M