From 160fa74b9b4715f58ba122943abdae3e49a032ca Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Tue, 13 Mar 2018 19:12:52 -0400
Subject: [PATCH 1/2] Merge pull request #36406 from optimumtact/qbopper

Make qbmax appear as qbopper when they talk in ooc
---
 code/modules/client/verbs/ooc.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 42b497fc09ef..7606dc157100 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -56,7 +56,6 @@
 	if(prefs.unlock_content)
 		if(prefs.toggles & MEMBER_PUBLIC)
 			keyname = "<font color='[prefs.ooccolor ? prefs.ooccolor : GLOB.normal_ooc_colour]'>[icon2html('icons/member_content.dmi', world, "blag")][keyname]</font>"
-
 	for(var/client/C in GLOB.clients)
 		if(C.prefs.chat_toggles & CHAT_OOC)
 			if(holder)

From 3b5d34d2098a6076d604cb0cacda88c6b68dca3a Mon Sep 17 00:00:00 2001
From: yogstation13-bot <jahostagat@thraml.com>
Date: Wed, 14 Mar 2018 00:48:31 +0100
Subject: [PATCH 2/2] Make qbmax appear as qbopper when they talk in ooc