From 0eeb1fdc981cb8cafcd3f712a0329df778529a5f Mon Sep 17 00:00:00 2001 From: izac112 Date: Wed, 17 Jun 2020 05:52:15 +0200 Subject: [PATCH 1/3] Makes mods actually show up --- code/game/verbs/ooc.dm | 10 ++++------ code/game/verbs/who.dm | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 4ee0213f8f..b599c1fa6f 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -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)) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 3cb25b702e..6ce49d78be 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -80,10 +80,10 @@ 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) + if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights)) //YW EDIT: Used to determine who shows up in admin rows if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights)) //Event Managerss can't see stealthmins continue @@ -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 = "Current Admins ([num_admins_online]):\n" + msg if(config.show_mods) - msg += "\n Current Game Masters ([num_mods_online]):\n" + modmsg + msg += "\n Current Moderators ([num_mods_online]):\n" + modmsg //YW EDIT if(config.show_devs) msg += "\n Current Developers ([num_devs_online]):\n" + devmsg From 57c53c71150790f55da1523f1c423d7f7e177549 Mon Sep 17 00:00:00 2001 From: izac112 Date: Wed, 17 Jun 2020 05:54:04 +0200 Subject: [PATCH 2/3] . --- code/game/verbs/who.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 6ce49d78be..386116c3c7 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -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_MOD & C.holder.rights)) //YW EDIT: Used to determine who shows up in admin rows From c6105684dbe08042cd639465cb18bcb70f5a941f Mon Sep 17 00:00:00 2001 From: izac112 Date: Wed, 17 Jun 2020 05:57:55 +0200 Subject: [PATCH 3/3] tweak --- code/game/verbs/who.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 386116c3c7..be062aef6f 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -80,10 +80,10 @@ 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_MOD & C.holder.rights)) //YW EDIT: Used to determine who shows up in admin rows + if(R_ADMIN & C.holder.rights && R_BAN & C.holder.rights) if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights)) //Event Managerss can't see stealthmins continue @@ -179,7 +179,7 @@ if(!C.holder.fakekey) msg += "\t[C] is a [C.holder.rank]\n" num_admins_online++ - else if (R_MOD & C.holder.rights && !(R_SERVER & C.holder.rights)) //YW EDIT + 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++