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

Merge branch 'master' into izac-tgs

Browse Source
This commit is contained in:
izac112
2020-06-17 06:24:27 +02:00
parent cf3238b0e2 18c4f7dcb2
commit 9178da5481
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/verbs/ooc.dm
+4 -6
View File
@@ -58,16 +58,14 @@
var/ooc_style = "everyone"
if(holder && !holder.fakekey)
ooc_style = "elevated"
//VOREStation Block Edit Start
if(holder.rights & R_EVENT) //Retired Admins
ooc_style = "event_manager"
if(holder.rights & R_ADMIN && !(holder.rights & R_BAN)) //Game Masters
//YawnWider Block Edit Start
if(holder.rights & R_MOD && !(holder.rights & R_BAN)) //Moderator
ooc_style = "moderator"
if(holder.rights & R_SERVER && !(holder.rights & R_BAN)) //Developers
if(holder.rights & R_DEBUG && !(holder.rights & R_BAN)) //Developers
ooc_style = "developer"
if(holder.rights & R_ADMIN && holder.rights & R_BAN) //Admins
ooc_style = "admin"
//VOREStation Block Edit End
//YawnWider Block Edit End
for(var/client/target in GLOB.clients)
if(target.is_preference_enabled(/datum/client_preference/show_ooc))
code/game/verbs/who.dm
+4 -4
View File
@@ -80,7 +80,7 @@
var/num_admins_online = 0
var/num_devs_online = 0
var/num_event_managers_online = 0
if(holder)
for(var/client/C in GLOB.admins)
if(R_ADMIN & C.holder.rights && R_BAN & C.holder.rights)
@@ -108,7 +108,7 @@
msg += "\n"
num_admins_online++
else if(R_ADMIN & C.holder.rights && !(R_SERVER & C.holder.rights))
else if(R_MOD & C.holder.rights && !(R_SERVER & C.holder.rights))
modmsg += "\t[C] is a [C.holder.rank]"
if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights))
@@ -179,7 +179,7 @@
if(!C.holder.fakekey)
msg += "\t[C] is a [C.holder.rank]\n"
num_admins_online++
else if(R_ADMIN & C.holder.rights && !(R_SERVER & C.holder.rights))
else if(R_MOD & C.holder.rights && !(R_SERVER & C.holder.rights)) //YW EDIT
if(!C.holder.fakekey)
modmsg += "\t[C] is a [C.holder.rank]\n"
num_mods_online++
@@ -195,7 +195,7 @@
msg = "<b>Current Admins ([num_admins_online]):</b>\n" + msg
if(config.show_mods)
msg += "\n<b> Current Game Masters ([num_mods_online]):</b>\n" + modmsg
msg += "\n<b> Current Moderators ([num_mods_online]):</b>\n" + modmsg //YW EDIT
if(config.show_devs)
msg += "\n<b> Current Developers ([num_devs_online]):</b>\n" + devmsg