From 73658bb9f60add2be7818850e6d07cb1d318081d Mon Sep 17 00:00:00 2001 From: ynot01 Date: Wed, 4 Dec 2019 01:17:40 -0500 Subject: [PATCH 1/6] tag --- code/modules/client/verbs/ooc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 1ddd959e37f6..c4cad633b1e9 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -114,14 +114,14 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc oocmsg += "OOC: [keyname]: [msg]" // Footer for an admin or AO's OOC. oocmsg_toadmins = oocmsg else - oocmsg = "[is_donator(src) ? "(Donator)" : ""]" if(is_mentor()) // If the speaker is a mentor + oocmsg = "["(Mentor)"]" oocmsg += "" else + oocmsg = "[is_donator(src) ? "(Donator)" : ""]" oocmsg += "" oocmsg += "OOC: [keyname]: [msg]" oocmsg_toadmins = oocmsg - //SENDING THE MESSAGES OUT for(var/c in GLOB.clients) var/client/C = c // God bless typeless for-loops From 6abb3f7f4f66984c7854703aef432a5a3b1e3b74 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Wed, 4 Dec 2019 01:22:30 -0500 Subject: [PATCH 2/6] where did that line go --- code/modules/client/verbs/ooc.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index c4cad633b1e9..e892ad899e22 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -122,6 +122,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc oocmsg += "" oocmsg += "OOC: [keyname]: [msg]" oocmsg_toadmins = oocmsg + //SENDING THE MESSAGES OUT for(var/c in GLOB.clients) var/client/C = c // God bless typeless for-loops From f4f1c7c4a442cdeeffb5fede26587a41399b8c10 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Wed, 4 Dec 2019 08:28:46 -0500 Subject: [PATCH 3/6] Update code/modules/client/verbs/ooc.dm Co-Authored-By: monster860 --- code/modules/client/verbs/ooc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index e892ad899e22..a00797132390 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -115,7 +115,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc oocmsg_toadmins = oocmsg else if(is_mentor()) // If the speaker is a mentor - oocmsg = "["(Mentor)"]" + oocmsg = "(Mentor)" oocmsg += "" else oocmsg = "[is_donator(src) ? "(Donator)" : ""]" @@ -435,4 +435,4 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc if(!anything) policytext += "No related rules found." - usr << browse(policytext.Join(""),"window=policy") \ No newline at end of file + usr << browse(policytext.Join(""),"window=policy") From a6f8e8dee3f1d9742ec258b9f230b35f095b3755 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Wed, 4 Dec 2019 09:19:27 -0500 Subject: [PATCH 4/6] Update ooc.dm --- code/modules/client/verbs/ooc.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index e892ad899e22..319e18192898 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -71,7 +71,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc keyname = "[icon2html('icons/member_content.dmi', world, "blag")][keyname]" //The linkify span classes and linkify=TRUE below make ooc text get clickable chat href links if you pass in something resembling a url //YOG START - Yog OOC - + //PINGS var/regex/ping = regex(@"@+(((([\s]{0,1}[^\s@]{0,30})[\s]*[^\s@]{0,30})[\s]*[^\s@]{0,30})[\s]*[^\s@]{0,30})","g")//Now lets check if they pinged anyone // Regex101 link to this specific regex, as of 3rd April 2019: https://regex101.com/r/YtmLDs/7 @@ -85,13 +85,13 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc clientkeys += Y.ckey if(Y.holder && Y.holder.fakekey) clientkeys += Y.holder.fakekey - pinged &= clientkeys + pinged &= clientkeys if(pinged.len) if((world.time - last_ping_time) < 30) to_chat(src,"You are pinging too much! Please wait before pinging again.") return last_ping_time = world.time - + //MESSAGE CRAFTING -- This part handles actually making the messages that are to be displayed. var/bussedcolor = GLOB.OOC_COLOR ? GLOB.OOC_COLOR : "" // So /TG/ decided to fuck up how OOC colours are handled. // So we're sticking a weird into shit to handle their new system. @@ -104,7 +104,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc else // Else if they're an AdminObserver oocmsg += "[find_admin_rank(src)]" // The header for an AO's OOC. //Check yogstation\code\module\client\verbs\ooc for the find_admin_rank definition. - + if(holder.fakekey) // If they're stealhminning oocmsg_toadmins = oocmsg + "OOC: [keyname]/([holder.fakekey]): [msg]" // ^ Message sent to people who should know when someone's stealthminning @@ -115,7 +115,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc oocmsg_toadmins = oocmsg else if(is_mentor()) // If the speaker is a mentor - oocmsg = "["(Mentor)"]" + oocmsg = "(Mentor)" oocmsg += "" else oocmsg = "[is_donator(src) ? "(Donator)" : ""]" @@ -420,7 +420,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc set name = "Show Policy" set desc = "Show special server rules related to your current character." set category = "OOC" - + //Collect keywords var/list/keywords = mob.get_policy_keywords() var/header = get_policy(POLICY_VERB_HEADER) From 36c4df7481ddb5c9c5cc3a9641a21c26dac142e4 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Wed, 4 Dec 2019 09:20:28 -0500 Subject: [PATCH 5/6] ooc color pref --- code/modules/client/verbs/ooc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index b965dc8b9bc2..ad724403fc9a 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -116,7 +116,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc else if(is_mentor()) // If the speaker is a mentor oocmsg = "(Mentor)" - oocmsg += "" + oocmsg += "" else oocmsg = "[is_donator(src) ? "(Donator)" : ""]" oocmsg += "" @@ -435,4 +435,4 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc if(!anything) policytext += "No related rules found." - usr << browse(policytext.Join(""),"window=policy") + usr << browse(policytext.Join(""),"window=policy") \ No newline at end of file From ca6f5985bd22483ce6ed41e4209b9791431c8d68 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Wed, 4 Dec 2019 10:10:14 -0500 Subject: [PATCH 6/6] bRaCkEtS --- code/modules/client/verbs/ooc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index ad724403fc9a..36e3a6ab1ca4 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -115,7 +115,7 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc oocmsg_toadmins = oocmsg else if(is_mentor()) // If the speaker is a mentor - oocmsg = "(Mentor)" + oocmsg = "\[Mentor]" oocmsg += "" else oocmsg = "[is_donator(src) ? "(Donator)" : ""]"